X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fmajor-upgrade-composable-steps-docker.yaml;h=f854ee84dcb8817d5d430a63a31b6b7717dc8d35;hb=d2e2b0a96806fa5eef2090d934f9e09372ce5074;hp=20340c78f8d14669b2d478d8626315feebf55b2f;hpb=2ccd6585ccf67cc67f15f2a1c364e7cd8dcfb01b;p=apex-tripleo-heat-templates.git

diff --git a/environments/major-upgrade-composable-steps-docker.yaml b/environments/major-upgrade-composable-steps-docker.yaml
index 20340c78..f854ee84 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
@@ -11,4 +8,7 @@ parameter_defaults:
     #!/bin/bash
     set -eu
     # Ocata to Pike, put any needed host-level workarounds here
+    yum update -y ansible
     yum install -y ansible-pacemaker
+  MigrationSshPort: 22
+  UpgradeRemoveUnusedPackages: false