From 4c85678fc5270ad32000fc292748953135dc24fb Mon Sep 17 00:00:00 2001 From: "Jesse Pretorius (odyssey4me)" Date: Mon, 18 May 2020 14:58:47 +0100 Subject: [PATCH] Correctly match openvswitch package The current regex will match more than one package if the openvswitchX.YZ-test package is installed. eg: rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-|openvswitch-2)/' openvswitch2.11-test-2.11.0-35.el7fdp.noarch openvswitch2.11-2.11.0-35.el7fdp.x86_64 The right package to find has the form: openvswitchA.BC-A.BC.D- So we change the regex to only match if it has that form. rhbz#1826367 Change-Id: I2f9456395b19c26d20917f8ca9183741566635c3 (cherry picked from commit 5b2daa49980bda49231842b4300cd08f4f339f61) --- docker/services/undercloud-upgrade.yaml | 2 +- puppet/services/tripleo-packages.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/services/undercloud-upgrade.yaml b/docker/services/undercloud-upgrade.yaml index 08397cc0df..3654a355ac 100644 --- a/docker/services/undercloud-upgrade.yaml +++ b/docker/services/undercloud-upgrade.yaml @@ -92,7 +92,7 @@ outputs: - name: Get current OpenvSwitch package name register: ovs_pkg_out shell: - rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-|openvswitch-2)/{print $1}' + rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-[0-9]+\.[0-9]+\.[-0]+-|openvswitch-2)/{print $1}' - name: Get version from current OpenvSwitch package register: ovs_version_out shell: diff --git a/puppet/services/tripleo-packages.yaml b/puppet/services/tripleo-packages.yaml index c73621620e..9c656fc614 100644 --- a/puppet/services/tripleo-packages.yaml +++ b/puppet/services/tripleo-packages.yaml @@ -151,7 +151,7 @@ outputs: - name: Get current OpenvSwitch package name register: ovs_pkg_out shell: - rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-|openvswitch-2)/{print $1}' + rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-[0-9]+\.[0-9]+\.[-0]+-|openvswitch-2)/{print $1}' - name: Get version from current OpenvSwitch package register: ovs_version_out shell: