Add StackUpdateType to set hiera on upgrade
This will enable those consuming the stack_update_type hieradata set by this parameter to differentiate an update from a major upgrade Change-Id: I38469f4b7d04165ea5371aeb0cbd2e9349d70c79
This commit is contained in:
parent
ae6883323e
commit
a7b5689679
@ -5,6 +5,7 @@ resource_registry:
|
|||||||
OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml
|
OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
EnableConfigPurge: false
|
EnableConfigPurge: false
|
||||||
|
StackUpdateType: UPGRADE
|
||||||
UpgradeLevelNovaCompute: auto
|
UpgradeLevelNovaCompute: auto
|
||||||
UpgradeInitCommonCommand: |
|
UpgradeInitCommonCommand: |
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
@ -2,6 +2,7 @@ resource_registry:
|
|||||||
OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml
|
OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
EnableConfigPurge: true
|
EnableConfigPurge: true
|
||||||
|
StackUpdateType: UPGRADE
|
||||||
UpgradeLevelNovaCompute: auto
|
UpgradeLevelNovaCompute: auto
|
||||||
UpgradeInitCommonCommand: |
|
UpgradeInitCommonCommand: |
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
@ -4,5 +4,6 @@ resource_registry:
|
|||||||
OS::TripleO::PostDeploySteps: ../docker/post.yaml
|
OS::TripleO::PostDeploySteps: ../docker/post.yaml
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
EnableConfigPurge: false
|
EnableConfigPurge: false
|
||||||
|
StackUpdateType: ''
|
||||||
UpgradeLevelNovaCompute: ''
|
UpgradeLevelNovaCompute: ''
|
||||||
UpgradeInitCommonCommand: ''
|
UpgradeInitCommonCommand: ''
|
||||||
|
@ -4,5 +4,6 @@ resource_registry:
|
|||||||
OS::TripleO::PostDeploySteps: ../puppet/post.yaml
|
OS::TripleO::PostDeploySteps: ../puppet/post.yaml
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
EnableConfigPurge: false
|
EnableConfigPurge: false
|
||||||
|
StackUpdateType: ''
|
||||||
UpgradeLevelNovaCompute: ''
|
UpgradeLevelNovaCompute: ''
|
||||||
UpgradeInitCommonCommand: ''
|
UpgradeInitCommonCommand: ''
|
||||||
|
@ -55,9 +55,18 @@ parameters:
|
|||||||
StackAction:
|
StackAction:
|
||||||
type: string
|
type: string
|
||||||
description: >
|
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:
|
constraints:
|
||||||
- allowed_values: ['CREATE', 'UPDATE']
|
- 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
|
# 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
|
# CA we'll actually be testing out. But we can change this if
|
||||||
# people request it.
|
# people request it.
|
||||||
@ -170,6 +179,7 @@ resources:
|
|||||||
deploy_identifier: {get_param: DeployIdentifier}
|
deploy_identifier: {get_param: DeployIdentifier}
|
||||||
update_identifier: {get_param: UpdateIdentifier}
|
update_identifier: {get_param: UpdateIdentifier}
|
||||||
stack_action: {get_param: StackAction}
|
stack_action: {get_param: StackAction}
|
||||||
|
stack_update_type: {get_param: StackUpdateType}
|
||||||
vip_data:
|
vip_data:
|
||||||
map_merge:
|
map_merge:
|
||||||
# Dynamically generate per-service VIP data based on enabled_services
|
# Dynamically generate per-service VIP data based on enabled_services
|
||||||
|
@ -0,0 +1,9 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The new StackUpdateType parameter is now set to UPGRADE
|
||||||
|
when a major version upgrade is in progress. This enables application
|
||||||
|
configuration via puppet to distinuish a major version upgrade from a
|
||||||
|
normal stack update (e.g for minor updates or reconfiguration) by
|
||||||
|
inspecting the stack_update_type hiera value. In future other values may be added to
|
||||||
|
flag e.g minor updates vs reconfiguration, but for now only UPGRADE is considered.
|
Loading…
x
Reference in New Issue
Block a user