diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-21 10:28:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-21 10:28:54 +0000 |
| commit | 6ec44d98b4a9aee3b469f31d08dd293bcff6db0e (patch) | |
| tree | 33d8191e2be2b1cbd46d168ca0e3af1819a39d8d /extraconfig/tasks/yum_update.sh | |
| parent | aed9e1b9c14058efc5fbdd41025fd688039ecf3b (diff) | |
| parent | afcb6e01f3af573a7bdd286a65b71eee48cec204 (diff) | |
Merge "Make the openvswitch 2.4->2.5 upgrade more robust"
Diffstat (limited to 'extraconfig/tasks/yum_update.sh')
| -rwxr-xr-x | extraconfig/tasks/yum_update.sh | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh index 8a88ee64..74af7b02 100755 --- a/extraconfig/tasks/yum_update.sh +++ b/extraconfig/tasks/yum_update.sh @@ -63,18 +63,7 @@ if [[ "$pacemaker_status" == "active" && \ fi # Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205 -if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then - echo "Manual upgrade of openvswitch - restart in postun detected" - mkdir OVS_UPGRADE || true - pushd OVS_UPGRADE - echo "Attempting to downloading latest openvswitch with yumdownloader" - yumdownloader --resolve openvswitch - echo "Updating openvswitch with nopostun option" - rpm -U --replacepkgs --nopostun ./*.rpm - popd -else - echo "Skipping manual upgrade of openvswitch - no restart in postun detected" -fi +special_case_ovs_upgrade_if_needed if [[ "$pacemaker_status" == "active" ]] ; then echo "Pacemaker running, stopping cluster node and doing full package update" |