openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Ensure config-download mappings are unset on ceph-upgrade"

This commit is contained in:
Zuul 2018-05-03 16:57:34 +00:00 committed by Gerrit Code Review
parent a2cf9be58a fc9d9ee493
commit 108706e37f
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.
# 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']

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
# by the operator. Please use additional -e env.yaml.
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: ''