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=bee9a9393030c04d5cdbe2a418505a40fa9107f3;hpb=0dd10ffe4fcd9b191eaceabcd7bb124a4db10b06;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 bee9a939..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,10 +42,11 @@ while systemctl is-active pacemaker; do
     fi
 done
 
-yum update -y
+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
-crudini  --set /etc/nova/nova.conf upgrade_levels compute liberty
+crudini  --set /etc/nova/nova.conf upgrade_levels compute "$upgrade_level_nova_compute"
 # https://bugzilla.redhat.com/show_bug.cgi?id=1284047
 # Change-Id: Ib3f6c12ff5471e1f017f28b16b1e6496a4a4b435
 crudini  --set /etc/ceilometer/ceilometer.conf DEFAULT rpc_backend rabbit