From b089cda9cc06107ae0c40a94da49c89f1d1097eb Mon Sep 17 00:00:00 2001 From: mciecier Date: Thu, 9 Feb 2023 14:22:22 +0100 Subject: [PATCH] Ansible package changed name to ansible-core, update exclude value Ansible package changed name to ansible-core. Exclude must stay due to bz https://bugs.launchpad.net/tripleo/+bug/1998501, only update exclude field to exclude ansible-core instead of ansible. As a part of standalone-roles work update tasks from tht deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml were migrated to tripleo-ansible and this is the reason why need tht change[1] together with this tripleo-ansible change. Related-Bug: #1998501 [1]https://review.opendev.org/c/openstack/tripleo-heat-templates/+/872568 Change-Id: I09586601036370696f0b93e7b171a0bcc5393b27 --- tripleo_ansible/roles/tripleo_packages/tasks/update.yml | 5 ++--- tripleo_ansible/roles/tripleo_packages/tasks/upgrade.yml | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tripleo_ansible/roles/tripleo_packages/tasks/update.yml b/tripleo_ansible/roles/tripleo_packages/tasks/update.yml index 7f2058683..7b7710ce0 100644 --- a/tripleo_ansible/roles/tripleo_packages/tasks/update.yml +++ b/tripleo_ansible/roles/tripleo_packages/tasks/update.yml @@ -14,15 +14,14 @@ # License for the specific language governing permissions and limitations # under the License. -# Exclude ansible until https://github.com/ansible/ansible/issues/56636 -# is available +# Exclude ansible-core due to bz https://bugs.launchpad.net/tripleo/+bug/1998501 - name: Update all packages when: - not skip_package_update|bool ansible.builtin.dnf: name: '*' state: latest - exclude: ansible + exclude: ansible-core # This is failsafe unless openvswitch package does something # to the systemd service state. - name: Ensure openvswitch is running after update diff --git a/tripleo_ansible/roles/tripleo_packages/tasks/upgrade.yml b/tripleo_ansible/roles/tripleo_packages/tasks/upgrade.yml index c9143b6d6..079e19ea7 100644 --- a/tripleo_ansible/roles/tripleo_packages/tasks/upgrade.yml +++ b/tripleo_ansible/roles/tripleo_packages/tasks/upgrade.yml @@ -325,11 +325,10 @@ failed_when: os_net_config_upgrade.rc not in [0,2] changed_when: os_net_config_upgrade.rc == 2 -# Ansbile cannot upgrade itself as it will cause the current execution to fail. -# https://github.com/ansible/ansible/issues/56636 +# Exclude ansible-core due to bz https://bugs.launchpad.net/tripleo/+bug/1998501 - name: Update all packages when: (step | int) == 3 yum: name: '*' state: latest - exclude: ansible + exclude: ansible-core