Merge "Add StackUpdateType to set hiera on upgrade"

This commit is contained in:
Jenkins 2017-05-05 05:06:04 +00:00 committed by Gerrit Code Review
commit c577755082
6 changed files with 24 additions and 1 deletions

View File

@ -5,6 +5,7 @@ resource_registry:
OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml
parameter_defaults:
EnableConfigPurge: false
StackUpdateType: UPGRADE
UpgradeLevelNovaCompute: auto
UpgradeInitCommonCommand: |
#!/bin/bash

View File

@ -2,6 +2,7 @@ resource_registry:
OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml
parameter_defaults:
EnableConfigPurge: true
StackUpdateType: UPGRADE
UpgradeLevelNovaCompute: auto
UpgradeInitCommonCommand: |
#!/bin/bash

View File

@ -4,6 +4,7 @@ resource_registry:
OS::TripleO::PostDeploySteps: ../docker/post.yaml
parameter_defaults:
EnableConfigPurge: false
StackUpdateType: ''
UpgradeLevelNovaCompute: ''
UpgradeInitCommonCommand: ''
UpgradeInitCommand: ''

View File

@ -4,6 +4,7 @@ resource_registry:
OS::TripleO::PostDeploySteps: ../puppet/post.yaml
parameter_defaults:
EnableConfigPurge: false
StackUpdateType: ''
UpgradeLevelNovaCompute: ''
UpgradeInitCommonCommand: ''
UpgradeInitCommand: ''

View File

@ -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

View File

@ -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.