Merge "Update ansible before the ansible upgrade tasks" into stable/pike

diff --git a/environments/major-upgrade-composable-steps-docker.yaml b/environments/major-upgrade-composable-steps-docker.yaml
index 1f45d02..f854ee8 100644 (file)
--- 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 (file)
--- 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