Browse Source

Merge "Correctly match openvswitch package" into stable/queens

changes/26/731326/1
Zuul 4 months ago
committed by Gerrit Code Review
parent
commit
f2a6e40c2d
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      puppet/services/tripleo-packages.yaml

+ 2
- 2
puppet/services/tripleo-packages.yaml View File

@@ -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]+-|openvswitch-2)/{print $1}'
rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-[0-9]+\.[0-9]+\.[-0]+-|openvswitch-2)/{print $1}'
- name: Don't update if not present
set_fact:
run_ovs_update: "{{ (ovs_pkg_out.stdout | length) > 0 }}"
@@ -325,7 +325,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: Don't update if not present
set_fact:
run_ovs_update: "{{ (ovs_pkg_out.stdout | length) > 0 }}"


Loading…
Cancel
Save