diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-17 01:22:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-17 01:22:44 +0000 |
| commit | eda5be6b5aedaa2957d931d05fcc040b059935d0 (patch) | |
| tree | 5805d09a6334f0d7d1be2b459d4f7ee10c60aed9 /environments | |
| parent | 1c17ba2322f4a736e2f724b787c043ac474a2932 (diff) | |
| parent | 01a91d37199f592aa4273e3847eb1f4f1d27da02 (diff) | |
Merge "Add Newton to Ocata UpgradeInitCommonCommand"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/major-upgrade-composable-steps.yaml | 11 | ||||
| -rw-r--r-- | environments/major-upgrade-converge.yaml | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/environments/major-upgrade-composable-steps.yaml b/environments/major-upgrade-composable-steps.yaml index 44580b43..9e3cddba 100644 --- a/environments/major-upgrade-composable-steps.yaml +++ b/environments/major-upgrade-composable-steps.yaml @@ -2,3 +2,14 @@ resource_registry: OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml parameter_defaults: 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 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 + diff --git a/environments/major-upgrade-converge.yaml b/environments/major-upgrade-converge.yaml index e3c0e531..f09fb20e 100644 --- a/environments/major-upgrade-converge.yaml +++ b/environments/major-upgrade-converge.yaml @@ -4,3 +4,4 @@ resource_registry: OS::TripleO::PostDeploySteps: ../puppet/post.yaml parameter_defaults: UpgradeLevelNovaCompute: '' + UpgradeInitCommonCommand: '' |