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