summaryrefslogtreecommitdiffstats
path: root/extraconfig
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-03 09:08:19 +0000
committerGerrit Code Review <review@openstack.org>2015-12-03 09:08:19 +0000
commit16871a864da4d121580d20df1f658e9fbe04794f (patch)
treef314f12f62d7e9d1517524a7a5bd6a21d538671a /extraconfig
parent5c604d28204397b49ad76d07df7e1351994f649e (diff)
parentf1720b349194d958022d27fd0c5c07e407f55478 (diff)
Merge "Add pcmk constraints against haproxy-clone only if applicable"
Diffstat (limited to 'extraconfig')
-rwxr-xr-xextraconfig/tasks/yum_update.sh66
1 files changed, 34 insertions, 32 deletions
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh
index 75b17e8b..e32369e1 100755
--- a/extraconfig/tasks/yum_update.sh
+++ b/extraconfig/tasks/yum_update.sh
@@ -45,6 +45,35 @@ pacemaker_status=$(systemctl is-active pacemaker)
pacemaker_dumpfile=$(mktemp)
if [[ "$pacemaker_status" == "active" ]] ; then
+SERVICES="memcached
+httpd
+neutron-dhcp-agent
+neutron-l3-agent
+neutron-metadata-agent
+neutron-openvswitch-agent
+neutron-server
+openstack-ceilometer-alarm-evaluator
+openstack-ceilometer-alarm-notifier
+openstack-ceilometer-api
+openstack-ceilometer-central
+openstack-ceilometer-collector
+openstack-ceilometer-notification
+openstack-cinder-api
+openstack-cinder-scheduler
+openstack-cinder-volume
+openstack-glance-api
+openstack-glance-registry
+openstack-heat-api
+openstack-heat-api-cfn
+openstack-heat-api-cloudwatch
+openstack-heat-engine
+openstack-keystone
+openstack-nova-api
+openstack-nova-conductor
+openstack-nova-consoleauth
+openstack-nova-novncproxy
+openstack-nova-scheduler"
+
echo "Dumping Pacemaker config"
pcs cluster cib $pacemaker_dumpfile
@@ -62,8 +91,11 @@ if [[ "$pacemaker_status" == "active" ]] ; then
pcs -f $pacemaker_dumpfile constraint order promote galera-master then openstack-keystone-clone
fi
- if ! pcs constraint order show | grep "start haproxy-clone then start openstack-keystone-clone"; then
- pcs -f $pacemaker_dumpfile constraint order start haproxy-clone then openstack-keystone-clone
+ if pcs resource | grep "haproxy-clone"; then
+ SERVICES="$SERVICES haproxy"
+ if ! pcs constraint order show | grep "start haproxy-clone then start openstack-keystone-clone"; then
+ pcs -f $pacemaker_dumpfile constraint order start haproxy-clone then openstack-keystone-clone
+ fi
fi
if ! pcs constraint order show | grep "start memcached-clone then start openstack-keystone-clone"; then
@@ -89,36 +121,6 @@ if [[ "$pacemaker_status" == "active" ]] ; then
fi
echo "Setting resource start/stop timeouts"
- SERVICES="
-haproxy
-memcached
-httpd
-neutron-dhcp-agent
-neutron-l3-agent
-neutron-metadata-agent
-neutron-openvswitch-agent
-neutron-server
-openstack-ceilometer-alarm-evaluator
-openstack-ceilometer-alarm-notifier
-openstack-ceilometer-api
-openstack-ceilometer-central
-openstack-ceilometer-collector
-openstack-ceilometer-notification
-openstack-cinder-api
-openstack-cinder-scheduler
-openstack-cinder-volume
-openstack-glance-api
-openstack-glance-registry
-openstack-heat-api
-openstack-heat-api-cfn
-openstack-heat-api-cloudwatch
-openstack-heat-engine
-openstack-keystone
-openstack-nova-api
-openstack-nova-conductor
-openstack-nova-consoleauth
-openstack-nova-novncproxy
-openstack-nova-scheduler"
for service in $SERVICES; do
pcs -f $pacemaker_dumpfile resource update $service op start timeout=100s op stop timeout=100s
done