aboutsummaryrefslogtreecommitdiffstats
path: root/extraconfig
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-29 13:03:21 +0000
committerGerrit Code Review <review@openstack.org>2016-09-29 13:03:21 +0000
commit2ff63895cbecca61f21886ed56cda038e4b7e25e (patch)
treee03a1d466b43841b9e3cdfbf47f9f7290821c553 /extraconfig
parent22decf4276c56b58b41ab6523c9a8da41ddeeab6 (diff)
parent89efa79599ca4bd5669136eca1e5670926f02b76 (diff)
Merge "Update gnocchi database during M/N upgrade."
Diffstat (limited to 'extraconfig')
-rwxr-xr-xextraconfig/tasks/major_upgrade_controller_pacemaker_2.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
index 158b57ae..80fab445 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
@@ -32,6 +32,8 @@ fi
start_or_enable_service galera
check_resource galera started 600
+start_or_enable_service redis
+check_resource galera 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
@@ -62,14 +64,13 @@ if [[ -n $(is_bootstrap_node) ]]; then
nova-manage db sync
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
fi
start_or_enable_service rabbitmq
check_resource rabbitmq started 600
-start_or_enable_service redis
-check_resource redis started 600
start_or_enable_service openstack-cinder-volume
check_resource openstack-cinder-volume started 600