openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Set normal CephAnsiblePlaybook on update/upgrade/ffwd converge"

Browse Source
This commit is contained in:
Zuul 2018-05-09 15:40:17 +00:00 committed by Gerrit Code Review
commit fee920d897
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +0,0 @@
# 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.
parameter_defaults:
CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']

1
environments/lifecycle/ffwd-upgrade-converge.yaml
View File

@ -8,4 +8,5 @@ resource_registry:
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: ''

2
environments/lifecycle/update-converge.yaml
View File

@ -4,3 +4,5 @@
resource_registry:
OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource
parameter_defaults:
CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']

1
environments/lifecycle/upgrade-converge.yaml
View File

@ -5,6 +5,7 @@ resource_registry:
OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource
parameter_defaults:
CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
UpgradeLevelNovaCompute: ''
UpgradeInitCommonCommand: ''
UpgradeInitCommand: ''