X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=extraconfig%2Ftasks%2Fmajor_upgrade_controller_pacemaker_1.sh;h=bf2ee330b0840cdef5000e9c9e13aa8d293a4654;hb=af068151a36229d82cf4f85991a9c41e378dd229;hp=ff73a9a2bb47e31575d9a7e22c9a6a7934a0ede7;hpb=8ecfaf4659a2dc2d3b8c3ff1ad11790f5835b94a;p=apex-tripleo-heat-templates.git

diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
index ff73a9a2..bf2ee330 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
@@ -30,11 +30,7 @@ if [ "$(hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid)" = "$(facter hostname)
 fi
 
 # Swift isn't controled by pacemaker
-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 stop $S
-done
+systemctl_swift stop
 
 tstart=$(date +%s)
 while systemctl is-active pacemaker; do
@@ -46,6 +42,7 @@ while systemctl is-active pacemaker; do
     fi
 done
 
+yum -y install python-zaqarclient  # needed for os-collect-config
 yum -y -q update
 
 # Pin messages sent to compute nodes to kilo, these will be upgraded later