aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Cornea <mcornea@redhat.com>2017-11-01 17:08:31 +0100
committerMarius Cornea <mcornea@redhat.com>2017-11-13 13:29:36 +0000
commitaf701f29f9b1bd0d19dc356d0071dce18f21cdf9 (patch)
tree6ca429a1f0059e82ab4309c109831642d21aede9
parent994922a8ba996fe68d047df0e1486fa805dbea31 (diff)
Update ansible before the ansible upgrade tasks
In case an ansible update is available during the upgrade then the ansible package gets updated to a new version by the ansible tasks. This could potentially lead to issues as the one described in LP#1729546. This change updates the ansible package via yum before starting the ansible upgrade tasks in order to avoid having ansible updating itself. Related-bug: 1729546 Change-Id: I2ea0aa1f670053578996018663c9fa52dec14b77 (cherry picked from commit 0c1ac1d752aaf88832b34e165f7d147e2304ff1c)
-rw-r--r--environments/major-upgrade-composable-steps-docker.yaml3
-rw-r--r--environments/major-upgrade-composable-steps.yaml3
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 1f45d02..f854ee8 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 e8a0074..0dbb6cd 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