diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-12-17 18:15:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-12-17 18:15:38 +0000 |
| commit | 0284f863a95d4cd27b19de048141cd7ec07c161b (patch) | |
| tree | 487a35450be0c69d3276b1cb28cdd9feeac3fd66 | |
| parent | f93697e7239b9ec800e8b43495461fb1df494641 (diff) | |
| parent | 8abee0148de563e9a5636fb0a5cd057036f7ab2c (diff) | |
Merge "Add fixup for pcs order constraints after update to new templates"
| -rwxr-xr-x | extraconfig/tasks/pacemaker_resource_restart.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/extraconfig/tasks/pacemaker_resource_restart.sh b/extraconfig/tasks/pacemaker_resource_restart.sh index ad3c3701..4e8b20fd 100755 --- a/extraconfig/tasks/pacemaker_resource_restart.sh +++ b/extraconfig/tasks/pacemaker_resource_restart.sh @@ -41,6 +41,12 @@ if [ "$pacemaker_status" = "active" -a \ "$(hiera bootstrap_nodeid)" = "$(facter hostname)" -a \ "$(hiera update_identifier)" != "nil" ]; then + #ensure neutron constraints like + #https://review.openstack.org/#/c/245093/ + if pcs constraint order show | grep "start neutron-server-clone then start neutron-ovs-cleanup-clone"; then + pcs constraint remove order-neutron-server-clone-neutron-ovs-cleanup-clone-mandatory + fi + pcs resource disable httpd check_resource httpd stopped 300 pcs resource disable openstack-keystone |