diff options
| author |   Steven Hardy <shardy@redhat.com> | 2017-07-13 13:40:48 +0100 |
|---|---|---|
| committer |   Athlan-Guyot sofer <sathlang@redhat.com> | 2017-08-11 17:25:02 +0000 |
| commit | 7f6305980df5427fd23c9c5b1b0307b1249945f6 (patch) | |
| tree | af692718ef42b4fa6437b22f7d65fedb32d718a8 /environments/major-upgrade-composable-steps-docker.yaml | |
| parent | 4e5ba442189d704deaaa1a922bbcaf5c28e9de40 (diff) | |
Consolidate puppet/docker deployments with one deploy steps workflow
If we consolidate these we can focus on one implementation (the new ansible
based one used for docker-steps)
Change-Id: Iec0ad2278d62040bf03613fc9556b199c6a80546
Depends-On: Ifa2afa915e0fee368fb2506c02de75bf5efe82d5
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 |