Improve logging: remove None from logs

Change-Id: Ib867a59fbcdd1259eb670ec17bfe0831e6012067
This commit is contained in:
Anastasia Kuznetsova 2016-05-06 17:46:52 +03:00
parent f395b86442
commit 9105564b3f
11 changed files with 17 additions and 12 deletions

View File

@ -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')

View File

@ -82,6 +82,7 @@ Forms:
- name: unitNamingPattern
type: string
label: Instance Naming Pattern
initial: gerrit
required: false
maxLength: 200
regexpValidator: '^[-_\w]+$'

View File

@ -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)

View File

@ -97,6 +97,7 @@ Forms:
required: false
- name: unitNamingPattern
type: string
initial: jenkins
label: Instance Naming Pattern
required: false
maxLength: 200

View File

@ -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...')

View File

@ -74,6 +74,7 @@ Forms:
required: false
- name: unitNamingPattern
type: string
initial: nodepool
label: Instance Naming Pattern
required: false
maxLength: 200

View File

@ -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)
- $.setAttr(deployed, false)

View File

@ -107,6 +107,7 @@ Forms:
- name: unitNamingPattern
type: string
label: Instance Naming Pattern
initial: openldap
required: false
maxLength: 200
regexpValidator: '^[-_\w]+$'

View File

@ -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)

View File

@ -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)

View File

@ -70,6 +70,7 @@ Forms:
- name: unitNamingPattern
type: string
label: Instance Naming Pattern
initial: zuul
required: false
maxLength: 200
regexpValidator: '^[-_\w]+$'