Merge "Start mongod before calling ceilometer-dbsync"

diff --combined extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
index 59c4bb0,e91c767..aef54f8
--- 1/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
--- 2/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
@@@ -32,6 -32,13 +32,13 @@@ f
  
  start_or_enable_service galera
  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
+ # we should be good.
+ # Due to LP Bug https://bugs.launchpad.net/tripleo/+bug/1627254 am using systemctl directly atm
+ systemctl start mongod
+ check_resource mongod started 600
  
  if [[ -n $(is_bootstrap_node) ]]; then
      tstart=$(date +%s)
@@@ -53,7 -60,6 +60,7 @@@
      keystone-manage db_sync
      neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini upgrade head
      nova-manage db sync
 +    nova-manage api_db sync
      #TODO(marios):someone from sahara needs to check this:
      # sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head
  fi