openstack/tripleo-heat-templates
Code Issues Proposed changes

Ensure config-download mappings are unset on ceph-upgrade

Browse Source 
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 <jistr@redhat.com>
Closes-Bug: #1767318
Related-Bug: #1767317
Change-Id: I52312ffcd438c354872ab3c74138b47ae71aab4b
(cherry picked from commit fc9d9ee49328b4745a6de02b0051d56f873d03cf)
This commit is contained in:
Giulio Fidente 2018-04-27 08:53:32 +02:00 committed by Lukas Bezdicka
parent d736daf8bd
commit 24469e3c02
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/lifecycle/ceph-upgrade-converge.yaml
View File

@ -1,7 +1,5 @@
# Environment file used in the last step of an overcloud upgrade. # Environment file used in the last step of an overcloud upgrade.
# This file is required by the tripleoclient and not expected to be updated # This file is required by the tripleoclient and not expected to be updated
# by the operator. Please use additional -e env.yaml. # by the operator. Please use additional -e env.yaml.
resource_registry:
OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
parameter_defaults: parameter_defaults:
CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample'] CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']

7
environments/lifecycle/ceph-upgrade-prepare.yaml
View File

@ -2,4 +2,9 @@
# This file is required by the tripleoclient and not expected to be updated # This file is required by the tripleoclient and not expected to be updated
# by the operator. Please use additional -e env.yaml. # by the operator. Please use additional -e env.yaml.
resource_registry: resource_registry:
OS::TripleO::DeploymentSteps: OS::Heat::None 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: ''