Update gnocchi database during M/N upgrade.

We call gnocchi-upgrade to make sure we update all the needed schemas
during the major-upgrade-pacemaker step.

We also make sure that redis is started before we call gnocchi-upgrade
otherwise the command will be stuck in a loop trying to contact redis.

Closes-Bug: #1626592
Change-Id: Ia016264b51f485b97fa150ebd357b109581342ed

diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
index 158b57a..80fab44 100755 (executable)
--- 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