openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "ffu: Allow FASTFORWARDUPGRADE as a StackUpdateType"

This commit is contained in:
Zuul 2018-02-14 18:27:22 +00:00 committed by Gerrit Code Review
parent 7c084d8431 3d8f47a71a
commit 0834134fd6
2 changed files with 2 additions and 2 deletions
Show Stats 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
when StackAction is UPDATE (both are the same stack action).
constraints:
- allowed_values: ['', 'UPGRADE']
- allowed_values: ['', 'UPGRADE', 'FASTFORWARDUPGRADE']
default: ''
EnableInternalTLS:
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
when StackAction is UPDATE (both are the same stack action).
constraints:
- allowed_values: ['', 'UPGRADE']
- allowed_values: ['', 'UPGRADE', 'FASTFORWARDUPGRADE']
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