summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authormarios <marios@redhat.com>2017-02-16 11:59:57 +0200
committerMarios Andreou <marios@redhat.com>2017-02-16 10:50:12 +0000
commit01a91d37199f592aa4273e3847eb1f4f1d27da02 (patch)
tree9e98754177136e5dd8bd84e0577a9bb895cdf97d /environments
parent306390d6bc6978dc87d378809b62a49c156bc8cc (diff)
Add Newton to Ocata UpgradeInitCommonCommand
This adds the UpgradeInitCommonCommand for newton..ocata common UpgradeInit commands. This comes before the ansible upgrade steps so we need to do things like remove the old newton hieradata and install the ansible-pacemaker module and ansible heat-agent plugin This defaults to '' and is set in the major-upgrade-composable-steps and unset in the major-upgrade-converge environment files. Change-Id: I0c7a32194c0069b63a501a913c17907b47c9cc16
Diffstat (limited to 'environments')
-rw-r--r--environments/major-upgrade-composable-steps.yaml11
-rw-r--r--environments/major-upgrade-converge.yaml1
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: ''