diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-12 07:18:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-12 07:18:07 +0000 |
| commit | ac16b57460c407a6320f4c784dc7512070a4e4f4 (patch) | |
| tree | cb0ebcffc3935b60c163b2a38997bf8269cbf031 /environments/major-upgrade-composable-steps-docker.yaml | |
| parent | 19855864b0ebac260ba520f13515577857c67f44 (diff) | |
| parent | 7f6305980df5427fd23c9c5b1b0307b1249945f6 (diff) | |
Merge "Consolidate puppet/docker deployments with one deploy steps workflow"
Diffstat (limited to 'environments/major-upgrade-composable-steps-docker.yaml')
| -rw-r--r-- | environments/major-upgrade-composable-steps-docker.yaml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/environments/major-upgrade-composable-steps-docker.yaml b/environments/major-upgrade-composable-steps-docker.yaml index 20340c78..888e2705 100644 --- a/environments/major-upgrade-composable-steps-docker.yaml +++ b/environments/major-upgrade-composable-steps-docker.yaml @@ -1,8 +1,5 @@ resource_registry: - # FIXME(shardy) do we need to break major_upgrade_steps.yaml apart to - # enable docker specific logic, or is just overridding PostUpgradeSteps - # enough (as we want to share the ansible tasks steps etc) - OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml + OS::TripleO::PostDeploySteps: ../common/major_upgrade_steps.yaml parameter_defaults: EnableConfigPurge: false StackUpdateType: UPGRADE |