openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add condition to ovs run during upgrade."

Browse Source
This commit is contained in:
Zuul 2018-05-30 09:08:29 +00:00 committed by Gerrit Code Review
commit ea26db3258
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
puppet/services/openvswitch.yaml
View File

@ -154,8 +154,13 @@ outputs:
- name: Check openvswitch version. - name: Check openvswitch version.
when: step|int == 2 when: step|int == 2
register: ovs_version register: ovs_version
ignore_errors: true
shell: rpm -qa | awk -F- '/^openvswitch-2/{print $2 "-" $3}' shell: rpm -qa | awk -F- '/^openvswitch-2/{print $2 "-" $3}'
- name: Check for openvswitch upgrade.
when: step|int == 2
register: ovs_need_upgrade
ignore_errors: true
shell: |
yum check-upgrade openvswitch | awk '/openvswitch/{print}'
- name: Check openvswitch packaging. - name: Check openvswitch packaging.
when: step|int == 2 when: step|int == 2
shell: rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep -q "systemctl.*try-restart" shell: rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep -q "systemctl.*try-restart"
@ -182,8 +187,7 @@ outputs:
register: ovs_list_of_rpms register: ovs_list_of_rpms
- name: Manual upgrade of OVS - name: Manual upgrade of OVS
shell: | shell: |
rpm -U --test {{item}} 2>&1 | grep "already installed" || \ rpm -U --replacepkgs --notriggerun --nopostun {{item}}
rpm -U --replacepkgs --notriggerun --nopostun {{item}};
args: args:
chdir: /root/OVS_UPGRADE chdir: /root/OVS_UPGRADE
with_items: with_items:
@ -192,3 +196,4 @@ outputs:
- step|int == 2 - step|int == 2
- "'2.5.0-14' in ovs_version.stdout|default('') or - "'2.5.0-14' in ovs_version.stdout|default('') or
ovs_packaging_issue|default(false)|succeeded" ovs_packaging_issue|default(false)|succeeded"
- ovs_need_upgrade.stdout|default('')