From 9105564b3f7f0939954e709b01875888dfeb6d45 Mon Sep 17 00:00:00 2001
From: Anastasia Kuznetsova <akuznetsova@mirantis.com>
Date: Fri, 6 May 2016 17:46:52 +0300
Subject: [PATCH] Improve logging: remove None from logs

Change-Id: Ib867a59fbcdd1259eb670ec17bfe0831e6012067
---
 murano-apps/Gerrit/package/Classes/Gerrit.yaml         | 4 ++--
 murano-apps/Gerrit/package/UI/ui.yaml                  | 1 +
 murano-apps/Jenkins/package/Classes/Jenkins.yaml       | 4 ++--
 murano-apps/Jenkins/package/UI/ui.yaml                 | 1 +
 murano-apps/Nodepool/package/Classes/Nodepool.yaml     | 4 ++--
 murano-apps/Nodepool/package/UI/ui.yaml                | 1 +
 murano-apps/OpenLDAP/package/Classes/OpenLDAP.yaml     | 6 +++---
 murano-apps/OpenLDAP/package/UI/ui.yaml                | 1 +
 murano-apps/Puppet/package/Classes/PuppetInstance.yaml | 2 +-
 murano-apps/Zuul/package/Classes/Zuul.yaml             | 4 ++--
 murano-apps/Zuul/package/UI/ui.yaml                    | 1 +
 11 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/murano-apps/Gerrit/package/Classes/Gerrit.yaml b/murano-apps/Gerrit/package/Classes/Gerrit.yaml
index b0ce522..f53ca0e 100644
--- a/murano-apps/Gerrit/package/Classes/Gerrit.yaml
+++ b/murano-apps/Gerrit/package/Classes/Gerrit.yaml
@@ -56,9 +56,9 @@ Methods:
           External: true
 
       - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress)
-      - $._environment.reporter.report($this, 'Creating VM for Gerrit {0}'.format($.instance.openstackId))
+      - $._environment.reporter.report($this, 'Creating VM for Gerrit "{0}"'.format($.instance.name))
       - $.instance.deploy()
-      - $._environment.reporter.report($this, 'Gerrit VM Created {0}'.format($.instance.openstackId))
+      - $._environment.reporter.report($this, 'Gerrit VM "{0}" with id {1} created'.format($.instance.name, $.instance.openstackId))
 
       - $._environment.reporter.report($this, 'Deploying Gerrit')
 
diff --git a/murano-apps/Gerrit/package/UI/ui.yaml b/murano-apps/Gerrit/package/UI/ui.yaml
index fc41796..7e1cedb 100644
--- a/murano-apps/Gerrit/package/UI/ui.yaml
+++ b/murano-apps/Gerrit/package/UI/ui.yaml
@@ -82,6 +82,7 @@ Forms:
         - name: unitNamingPattern
           type: string
           label: Instance Naming Pattern
+          initial: gerrit
           required: false
           maxLength: 200
           regexpValidator: '^[-_\w]+$'
diff --git a/murano-apps/Jenkins/package/Classes/Jenkins.yaml b/murano-apps/Jenkins/package/Classes/Jenkins.yaml
index 475fffa..570886b 100644
--- a/murano-apps/Jenkins/package/Classes/Jenkins.yaml
+++ b/murano-apps/Jenkins/package/Classes/Jenkins.yaml
@@ -43,9 +43,9 @@ Methods:
                 External: true
           - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress)
 
-          - $._environment.reporter.report($this, 'Creating VM for Jenkins {0}'.format($.instance.openstackId))
+          - $._environment.reporter.report($this, 'Creating VM for Jenkins "{0}"'.format($.instance.name))
           - $.instance.deploy()
-          - $._environment.reporter.report($this, 'Jenkins VM {0} created'.format($.instance.openstackId))
+          - $._environment.reporter.report($this, 'Jenkins VM "{0}" with id {1} created'.format($.instance.name, $.instance.openstackId))
 
           - $this.systemConfig: new(puppet:SystemConfig)
           - $this.systemConfig.installOnTheNode($this.instance)
diff --git a/murano-apps/Jenkins/package/UI/ui.yaml b/murano-apps/Jenkins/package/UI/ui.yaml
index 5769643..8ddbceb 100644
--- a/murano-apps/Jenkins/package/UI/ui.yaml
+++ b/murano-apps/Jenkins/package/UI/ui.yaml
@@ -97,6 +97,7 @@ Forms:
           required: false
         - name: unitNamingPattern
           type: string
+          initial: jenkins
           label: Instance Naming Pattern
           required: false
           maxLength: 200
diff --git a/murano-apps/Nodepool/package/Classes/Nodepool.yaml b/murano-apps/Nodepool/package/Classes/Nodepool.yaml
index 607be40..25551f0 100644
--- a/murano-apps/Nodepool/package/Classes/Nodepool.yaml
+++ b/murano-apps/Nodepool/package/Classes/Nodepool.yaml
@@ -37,9 +37,9 @@ Methods:
             IpProtocol: tcp
             External: true
       - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress)
-      - $._environment.reporter.report($this, 'Creating instance for Nodepool...')
+      - $._environment.reporter.report($this, 'Creating instance for Nodepool "{0}"'.format($.instance.name))
       - $.instance.deploy()
-      - $._environment.reporter.report($this, 'Nodepool instance is created.')
+      - $._environment.reporter.report($this, 'Nodepool instance "{0}" with id {1} created.'.format($.instance.name, $.instance.openstackId))
 
       - $._environment.reporter.report($this, 'Installing needed puppets for Nodepool...')
 
diff --git a/murano-apps/Nodepool/package/UI/ui.yaml b/murano-apps/Nodepool/package/UI/ui.yaml
index d715aa4..71295a5 100644
--- a/murano-apps/Nodepool/package/UI/ui.yaml
+++ b/murano-apps/Nodepool/package/UI/ui.yaml
@@ -74,6 +74,7 @@ Forms:
           required: false
         - name: unitNamingPattern
           type: string
+          initial: nodepool
           label: Instance Naming Pattern
           required: false
           maxLength: 200
diff --git a/murano-apps/OpenLDAP/package/Classes/OpenLDAP.yaml b/murano-apps/OpenLDAP/package/Classes/OpenLDAP.yaml
index 09d1616..2319ca9 100644
--- a/murano-apps/OpenLDAP/package/Classes/OpenLDAP.yaml
+++ b/murano-apps/OpenLDAP/package/Classes/OpenLDAP.yaml
@@ -45,9 +45,9 @@ Methods:
                 IpProtocol: tcp
                 External: true
           - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress)
-          - $._environment.reporter.report($this, 'Creating VM for OpenLDAP {0}'.format($.instance.openstackId))
+          - $._environment.reporter.report($this, 'Creating VM for OpenLDAP "{0}"'.format($.instance.name))
           - $.instance.deploy()
-          - $._environment.reporter.report($this, 'VM Created {0}'.format($.instance.openstackId))
+          - $._environment.reporter.report($this, 'OpenLDAP VM "{0}" with id {1} created'.format($.instance.name, $.instance.openstackId))
 
           - $.instance.installPuppetModule('datacentred-ldap')
 
@@ -127,4 +127,4 @@ Methods:
   destroy:
     Body:
       - $.reportDestroyed()
-      - $.setAttr(deployed, false)
\ No newline at end of file
+      - $.setAttr(deployed, false)
diff --git a/murano-apps/OpenLDAP/package/UI/ui.yaml b/murano-apps/OpenLDAP/package/UI/ui.yaml
index 11a0ded..92ab65d 100644
--- a/murano-apps/OpenLDAP/package/UI/ui.yaml
+++ b/murano-apps/OpenLDAP/package/UI/ui.yaml
@@ -107,6 +107,7 @@ Forms:
         - name: unitNamingPattern
           type: string
           label: Instance Naming Pattern
+          initial: openldap
           required: false
           maxLength: 200
           regexpValidator: '^[-_\w]+$'
diff --git a/murano-apps/Puppet/package/Classes/PuppetInstance.yaml b/murano-apps/Puppet/package/Classes/PuppetInstance.yaml
index 32c5628..eb3efc7 100644
--- a/murano-apps/Puppet/package/Classes/PuppetInstance.yaml
+++ b/murano-apps/Puppet/package/Classes/PuppetInstance.yaml
@@ -43,7 +43,7 @@ Methods:
   installPuppet:
     Body:
       - $._environment.reporter.report($this,
-        'Install puppet on instance {0}'.format($.openstackId))
+        'Install puppet on instance "{0}" with id {1}'.format($.name, $.openstackId))
       - $resources: new(sys:Resources)
       - $template: $resources.yaml('InstallPuppet.template')
       - $.agent.call($template, $resources)
diff --git a/murano-apps/Zuul/package/Classes/Zuul.yaml b/murano-apps/Zuul/package/Classes/Zuul.yaml
index deb9b39..40e0312 100644
--- a/murano-apps/Zuul/package/Classes/Zuul.yaml
+++ b/murano-apps/Zuul/package/Classes/Zuul.yaml
@@ -46,9 +46,9 @@ Methods:
                 External: true
           - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress)
 
-          - $._environment.reporter.report($this, 'Creating VM for Zuul {0}'.format($.instance.openstackId))
+          - $._environment.reporter.report($this, 'Creating VM for Zuul "{0}"'.format($.instance.name))
           - $.instance.deploy()
-          - $._environment.reporter.report($this, 'Zuul VM {0} is created'.format($.instance.openstackId))
+          - $._environment.reporter.report($this, 'Zuul VM "{0}" with id {1} created'.format($.instance.name, $.instance.openstackId))
 
           - $this.systemConfig: new(puppet:SystemConfig)
           - $this.systemConfig.installOnTheNode($this.instance)
diff --git a/murano-apps/Zuul/package/UI/ui.yaml b/murano-apps/Zuul/package/UI/ui.yaml
index 8645756..ed552eb 100644
--- a/murano-apps/Zuul/package/UI/ui.yaml
+++ b/murano-apps/Zuul/package/UI/ui.yaml
@@ -70,6 +70,7 @@ Forms:
         - name: unitNamingPattern
           type: string
           label: Instance Naming Pattern
+          initial: zuul
           required: false
           maxLength: 200
           regexpValidator: '^[-_\w]+$'