diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-31 23:37:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-31 23:37:24 +0000 |
| commit | 3c76dac14d474e0ae08e84da340036b92b539043 (patch) | |
| tree | c6b82382f67b3cb7444a1709189a4a6a1b1417ce /extraconfig/tasks/major_upgrade_ceph_storage.sh | |
| parent | d7653b73a411d7b99a9cde36748b2e74faf700cb (diff) | |
| parent | 61cba946cd11ab3a2d6518663f2300d7c98083de (diff) | |
Merge "Add replacepkgs to the manual ovs upgrade workaround and fix a typo"
Diffstat (limited to 'extraconfig/tasks/major_upgrade_ceph_storage.sh')
| -rw-r--r-- | extraconfig/tasks/major_upgrade_ceph_storage.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extraconfig/tasks/major_upgrade_ceph_storage.sh b/extraconfig/tasks/major_upgrade_ceph_storage.sh index e690a383..d84cad45 100644 --- a/extraconfig/tasks/major_upgrade_ceph_storage.sh +++ b/extraconfig/tasks/major_upgrade_ceph_storage.sh @@ -50,14 +50,14 @@ timeout 60 bash -c "while kill -0 ${OSD_PIDS} 2> /dev/null; do 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 +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 + echo "Updating openvswitch with nopostun option" + rpm -U --replacepkgs --nopostun ./*.rpm popd else echo "Skipping manual upgrade of openvswitch - no restart in postun detected" |