Merge "Option to specify python version and use package instead of yum."

defaults/main.yml

@@ -249,3 +249,6 @@ roles_upgrade_order: '__undefined__'
 
 # Packet loss threshold for a ping test
 loss_threshold: 1
+
+# Python version used
+py_ver: 2

tasks/fast-forward-upgrade/main.yml

@@ -37,7 +37,7 @@
 
 - block:
     - name: Ensure ansible-pacemaker module is present in CI.
-      yum:
+      package:
         name: ansible-pacemaker
         state: latest
       when: tripleo_ci|default(false)|bool

tasks/update/main.yml

@@ -79,7 +79,7 @@
       tags: overcloud_update_prepare_containers
 
     - name: Ensure ansible-pacemaker module is present in CI.
-      yum:
+      package:
         name: ansible-pacemaker
         state: latest
       when: tripleo_ci|default(false)|bool

tasks/upgrade/main.yml

@@ -79,7 +79,7 @@
       tags: overcloud_upgrade_prepare_containers
 
     - name: Ensure ansible-pacemaker module is present in CI.
-      yum:
+      package:
         name: ansible-pacemaker
         state: latest
       when: tripleo_ci|default(false)|bool

templates/undercloud_upgrade.sh.j2

@@ -4,7 +4,7 @@
 set -euo pipefail
 
 sudo yum update -y \
-     python-tripleoclient \
+     python{{ py_ver }}-tripleoclient \
      openstack-tripleo-common \
      openstack-tripleo-heat-templates