From 126ab398169b49dfd2b4eeccb320a220268e6999 Mon Sep 17 00:00:00 2001
From: Carlos Camacho <ccamacho@redhat.com>
Date: Tue, 4 Jun 2019 12:03:05 +0200
Subject: [PATCH] Put on hold the Ansible package update until is fixed

Package update for Ansible breaks[1] with:
Ansible 2.7 crashes on apt upgrade
because it upgrades itself to 2.8:
"fragment_class is None"

[1]: https://github.com/ansible/ansible/issues/56636

Change-Id: I1dabe448edfb118440b9ef1ee59c2e080d16ccf8
Closes-Bug: 1831589
(cherry picked from commit 53650f9635bc3b911e368a894603d7d07e3dec6a)
---
 .../tripleo-packages-baremetal-puppet.yaml       | 16 +++++++++++++---
 deployment/undercloud/undercloud-upgrade.yaml    |  7 ++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index f073b689b2..440760ee88 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -263,9 +263,14 @@ outputs:
             - step|int == 3
             - os_net_config_need_upgrade.stdout
             - os_net_config_has_config.rc == 0
+        # Exclude ansible until https://github.com/ansible/ansible/issues/56636
+        # is available
         - name: Update all packages
           when: step|int == 3
-          package: name=* state=latest
+          yum:
+            name: '*'
+            state: latest
+            exclude: ansible
       external_upgrade_tasks:
         - name: Clean up upgrade artifacts
           when: step|int == 1
@@ -289,9 +294,14 @@ outputs:
         - name: Exit if existing yum process
           fail: msg="ERROR existing yum.pid detected - can't continue! Please ensure there is no other package update process for the duration of the minor update worfklow. Exiting."
           when: (step|int == 0 or step|int == 3) and yum_pid_file.stat.exists
+        # Exclude ansible until https://github.com/ansible/ansible/issues/56636
+        # is available
         - name: Update all packages
-          package: name=* state=latest
-          when: step == "3"
+          when: step|int == 3
+          yum:
+            name: '*'
+            state: latest
+            exclude: ansible
         # This is failsafe unless openvswitch package does something to the systemd service state.
         - name: Ensure openvswitch is running after update
           when: step|int == 3
diff --git a/deployment/undercloud/undercloud-upgrade.yaml b/deployment/undercloud/undercloud-upgrade.yaml
index 08397cc0df..0613f2dde2 100644
--- a/deployment/undercloud/undercloud-upgrade.yaml
+++ b/deployment/undercloud/undercloud-upgrade.yaml
@@ -188,8 +188,9 @@ outputs:
             name: openvswitch
             enabled: yes
             state: started
-        - name: upgrade all packages
-          package:
+        - name: Update all packages
+          when: step|int == 3
+          yum:
             name: '*'
             state: latest
-          when: step|int == 3
+            exclude: ansible