diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-29 14:56:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-29 14:56:41 +0000 |
| commit | 6fadcce8682bd37eb9698ac0b6bac0087fde7955 (patch) | |
| tree | b16dd7b2a118eb6798e8de1d13a4657719322656 /extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh | |
| parent | 77480ec29c1a8b520bd895fb3fe0c6a0f4da120b (diff) | |
| parent | ad07a29f9474ef68d0edf218638fe6030c019629 (diff) | |
Merge "Fix races in major-upgrade-pacemaker Step2"
Diffstat (limited to 'extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh')
| -rwxr-xr-x | extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh index 80fab445..fc365939 100755 --- a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh +++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh @@ -68,20 +68,3 @@ if [[ -n $(is_bootstrap_node) ]]; then #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 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 |