X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=extraconfig%2Ftasks%2Fmajor_upgrade_object_storage.sh;h=2667bb167735e86591112bcb4e1498435cddab76;hb=21d2afd4bf9f57fd0fb3709d87acb452f13912df;hp=0f6d091ef59b35732b574ea88e7cc1e013934840;hpb=57e11697f983d8acbf95726cd7ef5a96d41613ad;p=apex-tripleo-heat-templates.git

diff --git a/extraconfig/tasks/major_upgrade_object_storage.sh b/extraconfig/tasks/major_upgrade_object_storage.sh
index 0f6d091e..2667bb16 100644
--- a/extraconfig/tasks/major_upgrade_object_storage.sh
+++ b/extraconfig/tasks/major_upgrade_object_storage.sh
@@ -12,19 +12,34 @@ cat > $UPGRADE_SCRIPT << ENDOFCAT
 ### This file is automatically delivered to the swift-storage nodes as part of the
 ### tripleo upgrades workflow
 
+set -eu
 
 function systemctl_swift {
-    action=$1
+    action=\$1
     for S in openstack-swift-account-auditor openstack-swift-account-reaper openstack-swift-account-replicator openstack-swift-account \
              openstack-swift-container-auditor openstack-swift-container-replicator openstack-swift-container-updater openstack-swift-container \
-             openstack-swift-object-auditor openstack-swift-object-replicator openstack-swift-object-updater openstack-swift-object openstack-swift-proxy; do
-                systemctl $action $S
+             openstack-swift-object-auditor openstack-swift-object-replicator openstack-swift-object-updater openstack-swift-object; do
+                systemctl \$action \$S
     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 option"
+    rpm -U --replacepkgs --nopostun ./*.rpm
+    popd
+else
+    echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
+fi
 
 systemctl_swift stop
 
+yum -y install python-zaqarclient  # needed for os-collect-config
 yum -y update
 
 systemctl_swift start