Merge "Prevent skip package fact to run on all steps."

deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml

@@ -421,9 +421,6 @@ 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}
         # Exclude ansible until https://github.com/ansible/ansible/issues/56636
         # is available
         - name: Update all packages
@@ -434,6 +431,8 @@ outputs:
             name: '*'
             state: latest
             exclude: ansible
+          vars:
+            skip_package_update: {get_param: SkipPackageUpdate}
       external_upgrade_tasks:
         - name: Clean up upgrade artifacts
           when: step|int == 1
@@ -466,9 +465,6 @@ 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}
         # Exclude ansible until https://github.com/ansible/ansible/issues/56636
         # is available
         - name: Update all packages
@@ -479,6 +475,8 @@ outputs:
             name: '*'
             state: latest
             exclude: ansible
+          vars:
+            skip_package_update: {get_param: SkipPackageUpdate}
         # This is failsafe unless openvswitch package does something to the systemd service state.
         - name: Ensure openvswitch is running after update
           when: step|int == 3