From da3bf441aa49608698a4eb6c64793d8689e52a48 Mon Sep 17 00:00:00 2001
From: Daniel Bengtsson <dbengt@redhat.com>
Date: Fri, 13 Dec 2019 16:28:47 +0100
Subject: [PATCH] Run update without yum update to apply hotfixes.

Add a new option to skip the yum update of all packages.

Change-Id: Idd22c7b4403bb63c06d2ba714d851a976e830108
(cherry picked from commit 4cc2b1196e2ac13de521b2fae0d1436a6f7d0d66)
(cherry picked from commit e5e6b95bb29f3a06a9db1121dc50fb2dbb6e16a6)
(cherry picked from commit f0dd6b3a6cf6bfdf37faa54116ae62ecb97c5130)
---
 puppet/services/tripleo-packages.yaml | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/puppet/services/tripleo-packages.yaml b/puppet/services/tripleo-packages.yaml
index 7a8c145173..c73621620e 100644
--- a/puppet/services/tripleo-packages.yaml
+++ b/puppet/services/tripleo-packages.yaml
@@ -65,6 +65,11 @@ parameters:
       major-upgrade-composable-steps.yaml and major-upgrade-converge.yaml
       environment files.
     default: ''
+  SkipPackageUpdate:
+    default: 'false'
+    description: Set to true to skip the update all packages
+    type: boolean
+
 
 outputs:
   role_data:
@@ -262,9 +267,16 @@ outputs:
             - step|int == 3
             - os_net_config_need_upgrade.stdout
             - os_net_config_has_config.rc == 0
+        - name: Set boolean skip_package_update
+          set_fact:
+            skip_package_update: {get_param: SkipPackageUpdate}
         - name: Update all packages
-          when: step|int == 3
-          package: name=* state=latest
+          when:
+            - step|int == 3
+            - not skip_package_update|bool
+          package:
+            name: '*'
+            state: latest
       update_tasks:
         - name: Check for existing yum.pid
           stat:  path=/var/run/yum.pid
@@ -273,9 +285,16 @@ 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
+        - name: Set boolean skip_package_update
+          set_fact:
+            skip_package_update: {get_param: SkipPackageUpdate}
         - name: Update all packages
-          package: name=* state=latest
-          when: step == "3"
+          when:
+            - step|int == 3
+            - not skip_package_update|bool
+          package:
+            name: '*'
+            state: latest
         # This is failsafe unless openvswitch package does something to the systemd service state.
         - name: Ensure openvswitch is running after update
           when: step|int == 3