summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorBen Nemec <bnemec@redhat.com>2017-06-27 10:26:08 -0500
committerEmilien Macchi <emilien@redhat.com>2017-07-21 18:39:13 +0000
commitc02a3436239df79ddecddde171b286f92aea2c10 (patch)
tree8e9cd0ff65c70b89bb580167a809c45c0e710851 /puppet
parent8fb3da3c6016341d1f7158b9841db63de9b86fdf (diff)
Make Deploy/UpdateIdentifier definition semi-consistent
It seems UpdateIdentifier is an overloaded parameter - it is used both to trigger package updates in the minor update case as well as to trigger the upgrade steps during a major upgrade. I'm not sure it's appropriate to change either of the descriptions as a result, so for the moment that is added to the exclusion list. Change-Id: Ied36cf259f6a6e5c8cfa7a01722fb7fda6900976 Partial-Bug: 1700664
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.