diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-05-05 05:06:04 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-05-05 05:06:04 +0000 |
commit | c577755082a92e638ca03ae8a8bd38045bf7901c (patch) | |
tree | 41ffc44340d0c5a5ae48cd8af9766a9053b60bc5 /puppet | |
parent | 8af47c20f361a12d34181c02e5ea266db0d9467e (diff) | |
parent | a7b56896792c1bd000295568c3b3706968e1bca1 (diff) |
Merge "Add StackUpdateType to set hiera on upgrade"
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/all-nodes-config.yaml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index 7edf17af..60290f64 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -55,9 +55,18 @@ parameters: StackAction: type: string description: > - Heat action on performed top-level stack. + Heat action on performed top-level stack. Note StackUpdateType is + set to UPGRADE when a major-version upgrade is in progress. constraints: - allowed_values: ['CREATE', 'UPDATE'] + StackUpdateType: + type: string + description: > + Type of update, to differentiate between UPGRADE and UPDATE cases + when StackAction is UPDATE (both are the same stack action). + constraints: + - allowed_values: ['', 'UPGRADE'] + default: '' # NOTE(jaosorior): This is being set as IPA as it's the first # CA we'll actually be testing out. But we can change this if # people request it. @@ -170,6 +179,7 @@ resources: deploy_identifier: {get_param: DeployIdentifier} update_identifier: {get_param: UpdateIdentifier} stack_action: {get_param: StackAction} + stack_update_type: {get_param: StackUpdateType} vip_data: map_merge: # Dynamically generate per-service VIP data based on enabled_services |