4742f2ed5a
As we discovered bug #1768586 we'll need to make sure that every parameter tweak in plan is followed by a stack update. So far the Ceph upgrade command did set param -> stack update -> unset param (only in plan). However this means the last CephAnsiblePlaybook setting (back to normal deploy playbook) was discarded. Let's reuse normal converge commands to converge CephAnsiblePlaybook too, and we can remove the (now unused) ceph-upgrade-converge.yaml. We won't do more stack updates than necessary, and at the same time the user workflow stays somewhat consistent between envs that do and don't have Ceph. An alternative would be to run the as part of the Ceph command, but that either means we'd have to run one more stack update then necessary, or skip the last converge in envs with Ceph, and essentially diverge further from the non-Ceph workflow. Change-Id: If596531cbb1e750ed67e66391743f4c1833e4337 Depends-On: I025eac40f8bda5f23c789e7fef1a9e9b49947f66 Partial-Bug: #1768586
13 lines
674 B
YAML
13 lines
674 B
YAML
# Environment file used in the last step of a ffwd 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::SoftwareDeployment: OS::Heat::StructuredDeployment
|
|
OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
|
|
OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource
|
|
OS::Heat::SoftwareDeployment: OS::TripleO::Heat::SoftwareDeployment
|
|
OS::Heat::StructuredDeployment: OS::TripleO::Heat::StructuredDeployment
|
|
parameter_defaults:
|
|
CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
|
|
StackUpdateType: ''
|