openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Correctly match openvswitch package" into stable/train

This commit is contained in:
Zuul 2020-05-22 01:58:51 +00:00 committed by Gerrit Code Review
parent 3d44b128cf 427df766bd
commit a925b755a0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
View File

@ -275,7 +275,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 }}"

2
deployment/undercloud/undercloud-upgrade.yaml
View File

@ -90,7 +90,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 }}"