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
(cherry picked from commit e75d05263c)
This commit is contained in:
Sofer Athlan-Guyot 2020-07-04 00:08:36 +02:00 committed by Daniel Bengtsson
parent 5609d73554
commit 94f62d8746
1 changed files with 4 additions and 6 deletions

View File

@ -270,9 +270,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
@ -283,6 +280,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
@ -315,9 +314,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}
- name: Special treatment for OpenvSwitch
tripleo_ovs_upgrade:
when:
@ -341,6 +337,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