Merge "[QUEENS ONLY] Fix layered upgrade workaround mechanism." into stable/queens

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