X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=extraconfig%2Ftasks%2Fmajor_upgrade_object_storage.sh;h=d9d1b4d548a407ad3f37d726f4228a960a31df11;hb=f0bed4c7e716d0427018a1246042e4cfec0c9476;hp=0f6d091ef59b35732b574ea88e7cc1e013934840;hpb=582a3115f744af151f4cd36a5ad0ac3e8ef09a7f;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..d9d1b4d5 100644
--- a/extraconfig/tasks/major_upgrade_object_storage.sh
+++ b/extraconfig/tasks/major_upgrade_object_storage.sh
@@ -12,19 +12,23 @@ 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
 }
 
+$(declare -f special_case_ovs_upgrade_if_needed)
+special_case_ovs_upgrade_if_needed
 
 systemctl_swift stop
 
+yum -y install python-zaqarclient  # needed for os-collect-config
 yum -y update
 
 systemctl_swift start