x/ci-cd-pipeline-app-murano
Code Issues Proposed changes

Fix error during deploy without Zuul and NodePool

Browse Source 
When user don't specify Zuul and NodePool application does not
initialize several options used by NodePool. As result all these options
are None and yaql failed with obvious error.

Change-Id: I3513e2ebd70bbfc6cad574cc53830fb90a16e614
This commit is contained in:
Sergey Kraynev 2016-07-06 12:14:01 +03:00
parent 07059c9d22
commit ab20fbe7b5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml
View File

@ -131,7 +131,7 @@ Methods:
gitEmail => $.ldapEmail)
# Zuul
- If: $this.zuul = null
- If: $this.zuul = null and $this.zuulNodepoolHelper != null
Then:
- $zuulInstanceName: concat($.instance_name, '-zuul')
- $zuulInstance: new(puppet:PuppetInstance, $._environment,
@ -147,7 +147,7 @@ Methods:
gerrit => $this.gerrit)
# Nodepool
- If: $this.nodepool = null
- If: $this.nodepool = null and $this.zuulNodepoolHelper != null
Then:
- $nodepoolInstanceName: concat($.instance_name, '-nodepool')
- $nodepoolInstance: new(puppet:PuppetInstance, $._environment,