Merge "Add all services to container scenarios" into stable/pike

[apex-tripleo-heat-templates.git] / environments / major-upgrade-composable-steps.yaml

diff --git a/environments/major-upgrade-composable-steps.yaml b/environments/major-upgrade-composable-steps.yaml
index 3bc9faa..e8a0074 100644 (file)
--- a/environments/major-upgrade-composable-steps.yaml
+++ b/environments/major-upgrade-composable-steps.yaml
@@ -1,16 +1,18 @@
 resource_registry:
-  OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml
+  OS::TripleO::PostDeploySteps: ../common/major_upgrade_steps.yaml
 parameter_defaults:
   EnableConfigPurge: true
+  StackUpdateType: UPGRADE
   UpgradeLevelNovaCompute: auto
   UpgradeInitCommonCommand: |
     #!/bin/bash
     # Newton to Ocata, we need to remove old hiera hook data and
     # install ansible heat agents and ansible-pacemaker
     set -eu
-    yum install -y openstack-heat-agents
     yum install -y python-heat-agent-*
     yum install -y ansible-pacemaker
     rm -f /usr/libexec/os-apply-config/templates/etc/puppet/hiera.yaml
     rm -f /usr/libexec/os-refresh-config/configure.d/40-hiera-datafiles
     rm -f /etc/puppet/hieradata/*.yaml
+  MigrationSshPort: 22
+  UpgradeRemoveUnusedPackages: false
\ No newline at end of file