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/major_upgrade_compute.sh | |
| parent | aed9e1b9c14058efc5fbdd41025fd688039ecf3b (diff) | |
| parent | afcb6e01f3af573a7bdd286a65b71eee48cec204 (diff) | |
Merge "Make the openvswitch 2.4->2.5 upgrade more robust"
Diffstat (limited to 'extraconfig/tasks/major_upgrade_compute.sh')
| -rw-r--r-- | extraconfig/tasks/major_upgrade_compute.sh | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/extraconfig/tasks/major_upgrade_compute.sh b/extraconfig/tasks/major_upgrade_compute.sh index b0d42806..7a3e1073 100644 --- a/extraconfig/tasks/major_upgrade_compute.sh +++ b/extraconfig/tasks/major_upgrade_compute.sh @@ -18,19 +18,8 @@ set -eu crudini --set /etc/nova/nova.conf upgrade_levels compute $upgrade_level_nova_compute -# 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 +$(declare -f special_case_ovs_upgrade_if_needed) +special_case_ovs_upgrade_if_needed yum -y install python-zaqarclient # needed for os-collect-config yum -y update |