diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-27 06:50:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-27 06:50:12 +0000 |
| commit | 9e1d7f04954107553474eda0c74f3df2365b22e9 (patch) | |
| tree | 19c726519adfec7b8ec3142d1f9f24941b2404bd | |
| parent | b3aab2900ff99a3e1ac58f0794b8c66bef6d3271 (diff) | |
| parent | b70d6e6f34ea0d379b9a787da9f6f8909c179dc8 (diff) | |
Merge "Disable openstack-cinder-volume in step1 and reenable it in step2"
| -rwxr-xr-x | extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh | 2 | ||||
| -rwxr-xr-x | extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh index 0c590a42..65dd2ab7 100755 --- a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh +++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh @@ -75,6 +75,8 @@ if [[ -n $(is_bootstrap_node) ]]; then check_resource rabbitmq stopped 600 pcs resource disable galera check_resource galera stopped 600 + pcs resource disable openstack-cinder-volume + check_resource openstack-cinder-volume stopped 600 # Disable all VIPs before stopping the cluster, so that pcs doesn't use one as a source address: # https://bugzilla.redhat.com/show_bug.cgi?id=1330688 for vip in $(pcs resource show | grep ocf::heartbeat:IPaddr2 | grep Started | awk '{ print $1 }'); do diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh index 6055a3f9..4dc2b168 100755 --- a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh +++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh @@ -69,6 +69,9 @@ 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 + # Swift isn't controled by pacemaker systemctl_swift start |