diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-10 19:00:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-10 19:00:08 +0000 |
| commit | 9b4a981f955ea4a187c92e24c980f45c42f9a02a (patch) | |
| tree | b2e2d3c9f836823a2e89a7224fcedc14fb513810 /extraconfig/tasks/major_upgrade_controller_pacemaker_4.sh | |
| parent | 64a277323c580b16196b1d1805120ba35de1690c (diff) | |
| parent | dde12b075ff51d4def4f49e635dd390a7f1f2cac (diff) | |
Merge "Fix race during major-upgrade-pacemaker step"
Diffstat (limited to 'extraconfig/tasks/major_upgrade_controller_pacemaker_4.sh')
| -rwxr-xr-x | extraconfig/tasks/major_upgrade_controller_pacemaker_4.sh | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_4.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_4.sh index fa95f1f8..d2cb9553 100755 --- a/extraconfig/tasks/major_upgrade_controller_pacemaker_4.sh +++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_4.sh @@ -2,7 +2,16 @@ set -eu -if [[ -n $(is_bootstrap_node) ]]; then - # run gnocchi upgrade - gnocchi-upgrade -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 + +# start httpd so keystone is available for gnocchi +# upgrade to run. +systemctl start httpd + +# Swift isn't controled by pacemaker +systemctl_swift start |