X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=extraconfig%2Ftasks%2Fmajor_upgrade_ceph_storage.sh;h=d84cad45a219a3048b79adc7d06e09c215d09e27;hb=0f41197e6aeded5d5d2a0c3f9f0cd1a0d709d087;hp=e690a38367adba0da4984f18f024c81fbcd8c676;hpb=ef38e5af9f65ddea33ad3c0e22f904d0f1b85ddb;p=apex-tripleo-heat-templates.git

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"