diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-14 17:39:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-14 17:39:33 +0000 |
| commit | f4fb17e7331ec1dd50a389ec59b3e36d2e1471b4 (patch) | |
| tree | 801ac034b908e968a3c9c6e7337a9ea4787c6b86 | |
| parent | b2c2755db70604a3bbbf78d0f0e4d61a518300a6 (diff) | |
| parent | af701f29f9b1bd0d19dc356d0071dce18f21cdf9 (diff) | |
Merge "Update ansible before the ansible upgrade tasks" into stable/pike
| -rw-r--r-- | environments/major-upgrade-composable-steps-docker.yaml | 3 | ||||
| -rw-r--r-- | environments/major-upgrade-composable-steps.yaml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/environments/major-upgrade-composable-steps-docker.yaml b/environments/major-upgrade-composable-steps-docker.yaml index 1f45d025..f854ee84 100644 --- a/environments/major-upgrade-composable-steps-docker.yaml +++ b/environments/major-upgrade-composable-steps-docker.yaml @@ -8,6 +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
\ No newline at end of file + UpgradeRemoveUnusedPackages: false diff --git a/environments/major-upgrade-composable-steps.yaml b/environments/major-upgrade-composable-steps.yaml index e8a00740..0dbb6cda 100644 --- a/environments/major-upgrade-composable-steps.yaml +++ b/environments/major-upgrade-composable-steps.yaml @@ -10,9 +10,10 @@ parameter_defaults: # install ansible heat agents and ansible-pacemaker set -eu yum install -y python-heat-agent-* + yum update -y ansible 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 + UpgradeRemoveUnusedPackages: false |