openstack/tripleo-heat-templates
Code Issues Proposed changes

ffu: Allow FASTFORWARDUPGRADE as a StackUpdateType

Browse Source 
This change allows FASTFORWARDUPGRADE to be fed to puppet-tripleo
allowing mainifests to act according when applied during FFU.

Change-Id: I8792937c2524c31becfb8a9f28047b73617c0fc3
This commit is contained in:
Lee Yarwood
2017-11-23 13:08:21 +00:00
committed by Pradeep Kilambi
parent 7777f7b02e
commit 3d8f47a71a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/services/ceph-ansible/ceph-base.yaml
View File

@@ -36,7 +36,7 @@ parameters:
Type of update, to differentiate between UPGRADE and UPDATE cases Type of update, to differentiate between UPGRADE and UPDATE cases
when StackAction is UPDATE (both are the same stack action). when StackAction is UPDATE (both are the same stack action).
constraints: constraints:
- allowed_values: ['', 'UPGRADE'] - allowed_values: ['', 'UPGRADE', 'FASTFORWARDUPGRADE']
default: '' default: ''
EnableInternalTLS: EnableInternalTLS:
type: boolean type: boolean

2
puppet/all-nodes-config.j2.yaml
View File

@@ -56,7 +56,7 @@ parameters:
Type of update, to differentiate between UPGRADE and UPDATE cases Type of update, to differentiate between UPGRADE and UPDATE cases
when StackAction is UPDATE (both are the same stack action). when StackAction is UPDATE (both are the same stack action).
constraints: constraints:
- allowed_values: ['', 'UPGRADE'] - allowed_values: ['', 'UPGRADE', 'FASTFORWARDUPGRADE']
default: '' 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