diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-11-25 14:42:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-11-25 14:42:10 +0000 |
| commit | 83fd16ecf46f9848247ea9676cacf195db71da21 (patch) | |
| tree | 10d8cb05f13e553a34b6768ce8383dc964de5a7b | |
| parent | 7bae1ce8b0de5108e5219d2cadb712425eaf0f87 (diff) | |
| parent | f070fa189c8f218f979263816975fdfa13451623 (diff) | |
Merge "Fixup neutron constraints in older overclouds before updating"
| -rwxr-xr-x | extraconfig/tasks/yum_update.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh index 6ab2501c..69ff5543 100755 --- a/extraconfig/tasks/yum_update.sh +++ b/extraconfig/tasks/yum_update.sh @@ -74,6 +74,16 @@ if [[ "$pacemaker_status" == "active" ]] ; then pcs -f $pacemaker_dumpfile constraint order promote redis-master then start openstack-ceilometer-central-clone require-all=false fi + # ensure neutron constraints https://review.openstack.org/#/c/229466 + # remove ovs-cleanup after server and add openvswitch-agent instead + if pcs constraint order show | grep "start neutron-server-clone then start neutron-ovs-cleanup-clone"; then + pcs -f $pacemaker_dumpfile constraint remove order-neutron-server-clone-neutron-ovs-cleanup-clone-mandatory + fi + if ! pcs constraint order show | grep "start neutron-server-clone then start neutron-openvswitch-agent-clone"; then + pcs -f $pacemaker_dumpfile constraint order start neutron-server-clone then neutron-openvswitch-agent-clone + fi + + if ! pcs resource defaults | grep "resource-stickiness: INFINITY"; then pcs -f $pacemaker_dumpfile resource defaults resource-stickiness=INFINITY fi |