X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=extraconfig%2Ftasks%2Fmajor_upgrade_controller_pacemaker_2.sh;h=b3a0098c4bc5d4eb4fcbb0d859cea4232c221dfe;hb=022c8586a993613e8f9398e8e141d69e8145f0b7;hp=80fab4455442514bf3ddf925837a8d5d46965aa1;hpb=89efa79599ca4bd5669136eca1e5670926f02b76;p=apex-tripleo-heat-templates.git

diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
index 80fab445..b3a0098c 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
@@ -33,7 +33,7 @@ fi
 start_or_enable_service galera
 check_resource galera started 600
 start_or_enable_service redis
-check_resource galera started 600
+check_resource redis started 600
 # We need mongod which is now a systemd service up and running before calling
 # ceilometer-dbsync. There is still a race here: mongod might not be up on all nodes
 # so ceilometer-dbsync will fail a couple of times before that. As it retries indefinitely
@@ -65,23 +65,5 @@ if [[ -n $(is_bootstrap_node) ]]; then
     nova-manage api_db sync
     nova-manage db online_data_migrations
     gnocchi-upgrade
-    #TODO(marios):someone from sahara needs to check this:
-    # sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head
+    sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head
 fi
-
-start_or_enable_service rabbitmq
-check_resource rabbitmq started 600
-start_or_enable_service openstack-cinder-volume
-check_resource openstack-cinder-volume started 600
-
-
-# Swift isn't controled by pacemaker
-systemctl_swift start
-
-# We need to start the systemd services we explicitely stopped at step _1.sh
-# FIXME: Should we let puppet during the convergence step do the service enabling or
-# should we add it here?
-for service in $(services_to_migrate); do
-    manage_systemd_service start "${service%%-clone}"
-    check_resource_systemd "${service%%-clone}" started 600
-done