From 4958c2ef75168d6f1840458f660a357806d4da4d Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Wed, 30 Sep 2020 19:26:14 +0200 Subject: [PATCH] [QUEENS ONLY] Fix layered upgrade workaround mechanism. The regex was only matching ovs layered package with ".0" in the last number end. This fixes it. Queens only because in master and below we use tripleo-ansible/tripleo-ovs-upgrade module and it has the correct regex. Change-Id: I9120a7bc3b0afaf07be4ea90f65e9bb30c534fb8 Closes-Bug: #1897949 --- puppet/services/tripleo-packages.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/puppet/services/tripleo-packages.yaml b/puppet/services/tripleo-packages.yaml index 11df8d0cdb..cf8199a625 100644 --- a/puppet/services/tripleo-packages.yaml +++ b/puppet/services/tripleo-packages.yaml @@ -134,7 +134,7 @@ outputs: - name: Get current OpenvSwitch package name register: ovs_pkg_out shell: - rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-[0-9]+\.[0-9]+\.[-0]+-|openvswitch-2)/{print $1}' + rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-[0-9]+\.[0-9]+\.[0-9]+-|openvswitch-2)/{print $1}' when: - step|int == 2 - name: Don't update if not present @@ -331,7 +331,7 @@ outputs: - name: Get current OpenvSwitch package name register: ovs_pkg_out shell: - rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-[0-9]+\.[0-9]+\.[-0]+-|openvswitch-2)/{print $1}' + rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-[0-9]+\.[0-9]+\.[0-9]+-|openvswitch-2)/{print $1}' when: - step|int == 2 or step|int == 3 - name: Don't update if not present