summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-22 07:55:10 +0000
committerGerrit Code Review <review@openstack.org>2017-07-22 07:55:10 +0000
commitbb963cfe422d1ad4de2fa5b7cf24fa3907582ad9 (patch)
tree7c509c4e479837f533f79626ce109eb9929877db /puppet
parent617e5f1022da5309328a1d9c96399c1fedd257ec (diff)
parentc02a3436239df79ddecddde171b286f92aea2c10 (diff)
Merge "Make Deploy/UpdateIdentifier definition semi-consistent"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/all-nodes-config.yaml1
-rw-r--r--puppet/major_upgrade_steps.j2.yaml1
2 files changed, 2 insertions, 0 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index b29a8a98..24aa1525 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -45,6 +45,7 @@ parameters:
perform configuration on a Heat stack-update.
UpdateIdentifier:
type: string
+ default: ''
description: >
Setting to a previously unused value during stack-update will trigger
package update on all nodes
diff --git a/puppet/major_upgrade_steps.j2.yaml b/puppet/major_upgrade_steps.j2.yaml
index 574c41b0..625ff4d9 100644
--- a/puppet/major_upgrade_steps.j2.yaml
+++ b/puppet/major_upgrade_steps.j2.yaml
@@ -18,6 +18,7 @@ parameters:
type: json
UpdateIdentifier:
type: string
+ default: ''
description: >
Setting to a previously unused value during stack-update will trigger
the Upgrade resources to re-run on all roles.