openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add fixup for pcs order constraints after update to new templates"

Browse Source
This commit is contained in:
Jenkins 2015-12-17 18:15:38 +00:00 committed by Gerrit Code Review
commit 0284f863a9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extraconfig/tasks/pacemaker_resource_restart.sh
View File

@ -41,6 +41,12 @@ if [ "$pacemaker_status" = "active" -a \
"$(hiera bootstrap_nodeid)" = "$(facter hostname)" -a \ "$(hiera bootstrap_nodeid)" = "$(facter hostname)" -a \
"$(hiera update_identifier)" != "nil" ]; then "$(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 pcs resource disable httpd
check_resource httpd stopped 300 check_resource httpd stopped 300
pcs resource disable openstack-keystone pcs resource disable openstack-keystone