diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-21 16:23:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-21 16:23:16 +0000 |
| commit | ec02ba63193efbff517c6a50cc7157d0a0d298ea (patch) | |
| tree | 5698a0c4675d2762ec9bd757d8747cb11720130b /extraconfig/tasks/major_upgrade_ceph_storage.sh | |
| parent | 60750a2e0254a2cac885cfa4cd55ebb518593324 (diff) | |
| parent | 7e09b70bc336b70be9042c8971ad020c6343d6c2 (diff) | |
Merge "Add special case handling for OVS upgrade in updates and upgrades"
Diffstat (limited to 'extraconfig/tasks/major_upgrade_ceph_storage.sh')
| -rw-r--r-- | extraconfig/tasks/major_upgrade_ceph_storage.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/extraconfig/tasks/major_upgrade_ceph_storage.sh b/extraconfig/tasks/major_upgrade_ceph_storage.sh index 56b54e22..e690a383 100644 --- a/extraconfig/tasks/major_upgrade_ceph_storage.sh +++ b/extraconfig/tasks/major_upgrade_ceph_storage.sh @@ -49,6 +49,20 @@ timeout 60 bash -c "while kill -0 ${OSD_PIDS} 2> /dev/null; do sleep 2; done" +# 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" + rpm -U --nopostun ./*.rpm + popd +else + echo "Skipping manual upgrade of openvswitch - no restart in postun detected" +fi + # Update (Ceph to Jewel) yum -y install python-zaqarclient # needed for os-collect-config yum -y update |