diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-04-03 09:56:40 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-04-03 09:56:40 +0000 |
commit | 96fc0659c3736f752927a4bce3550678bf3bb44e (patch) | |
tree | 2fb839460c3a457949f616e368f6db8ebf245a11 /extraconfig/tasks/pacemaker_common_functions.sh | |
parent | f8d229285bf4a4786e6adf0f60e1a8046cf46972 (diff) | |
parent | 2e7c850fa1d78f2b21e5017e03b15a066a0666da (diff) |
Merge "Add special case upgrade from openvswitch 2.5.0-14" into stable/ocata
Diffstat (limited to 'extraconfig/tasks/pacemaker_common_functions.sh')
-rwxr-xr-x | extraconfig/tasks/pacemaker_common_functions.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/extraconfig/tasks/pacemaker_common_functions.sh b/extraconfig/tasks/pacemaker_common_functions.sh index aae4a2de..4480f74d 100755 --- a/extraconfig/tasks/pacemaker_common_functions.sh +++ b/extraconfig/tasks/pacemaker_common_functions.sh @@ -299,9 +299,10 @@ function systemctl_swift { } # Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205 +# Update condition and add --notriggerun for +bug/1669714 function special_case_ovs_upgrade_if_needed { - if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then - echo "Manual upgrade of openvswitch - restart in postun detected" + if rpm -qa | grep "^openvswitch-2.5.0-14" || rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart" ; then + echo "Manual upgrade of openvswitch - ovs-2.5.0-14 or restart in postun detected" rm -rf OVS_UPGRADE mkdir OVS_UPGRADE && pushd OVS_UPGRADE echo "Attempting to downloading latest openvswitch with yumdownloader" @@ -310,8 +311,8 @@ function special_case_ovs_upgrade_if_needed { if rpm -U --test $pkg 2>&1 | grep "already installed" ; then echo "Looks like newer version of $pkg is already installed, skipping" else - echo "Updating $pkg with nopostun option" - rpm -U --replacepkgs --nopostun $pkg + echo "Updating $pkg with --nopostun --notriggerun" + rpm -U --replacepkgs --nopostun --notriggerun $pkg fi done popd |