From 3d8f47a71a343c4682c068e1d746f22811382d1b Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Thu, 23 Nov 2017 13:08:21 +0000 Subject: [PATCH] ffu: Allow FASTFORWARDUPGRADE as a StackUpdateType This change allows FASTFORWARDUPGRADE to be fed to puppet-tripleo allowing mainifests to act according when applied during FFU. Change-Id: I8792937c2524c31becfb8a9f28047b73617c0fc3 --- docker/services/ceph-ansible/ceph-base.yaml | 2 +- puppet/all-nodes-config.j2.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index b4b2c0f17f..7e39e65516 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -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 diff --git a/puppet/all-nodes-config.j2.yaml b/puppet/all-nodes-config.j2.yaml index 088661c0d0..e015498a5f 100644 --- a/puppet/all-nodes-config.j2.yaml +++ b/puppet/all-nodes-config.j2.yaml @@ -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