From e75d05263cad2d9fcd9043607ec3953431efd536 Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Sat, 4 Jul 2020 00:08:36 +0200 Subject: [PATCH] Prevent skip package fact to run on all steps. We refactor it into a vars for the task for upgrade and update tasks. Partial-Bug: #1886932 Change-Id: I980f633989e74ca14784d5985b447334027603b8 --- .../tripleo-packages-baremetal-puppet.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml index bff36d6a40..7645881869 100644 --- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml +++ b/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