From fc9d9ee49328b4745a6de02b0051d56f873d03cf Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 27 Apr 2018 08:53:32 +0200 Subject: [PATCH] Ensure config-download mappings are unset on ceph-upgrade Purpose is to ensure that any mapping previously used to enable config-download is reset to perform a regular Heat stack update on ceph-upgrade. We may need to do "update/upgrade/ffwd -> ceph -> converge" instead of the previously assumed "update/upgrade/ffwd -> converge -> ceph". This also removes the no-op of DeploymentSteps -- we need them enabled during Ceph upgrade as we need firewall rules applied. Co-Authored-By: Jiri Stransky Closes-Bug: #1767318 Related-Bug: #1767317 Change-Id: I52312ffcd438c354872ab3c74138b47ae71aab4b --- environments/lifecycle/ceph-upgrade-converge.yaml | 2 -- environments/lifecycle/ceph-upgrade-prepare.yaml | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/environments/lifecycle/ceph-upgrade-converge.yaml b/environments/lifecycle/ceph-upgrade-converge.yaml index 1e73942ca2..7dc14e93af 100644 --- a/environments/lifecycle/ceph-upgrade-converge.yaml +++ b/environments/lifecycle/ceph-upgrade-converge.yaml @@ -1,7 +1,5 @@ # Environment file used in the last step of an overcloud upgrade. # This file is required by the tripleoclient and not expected to be updated # by the operator. Please use additional -e env.yaml. -resource_registry: - OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup parameter_defaults: CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample'] diff --git a/environments/lifecycle/ceph-upgrade-prepare.yaml b/environments/lifecycle/ceph-upgrade-prepare.yaml index d0fedf0bd7..7c4236f194 100644 --- a/environments/lifecycle/ceph-upgrade-prepare.yaml +++ b/environments/lifecycle/ceph-upgrade-prepare.yaml @@ -2,4 +2,9 @@ # This file is required by the tripleoclient and not expected to be updated # by the operator. Please use additional -e env.yaml. resource_registry: - OS::TripleO::DeploymentSteps: OS::Heat::None \ No newline at end of file + OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment + OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup + OS::Heat::SoftwareDeployment: OS::TripleO::Heat::SoftwareDeployment + OS::Heat::StructuredDeployment: OS::TripleO::Heat::StructuredDeployment +parameter_defaults: + StackUpdateType: ''