X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=extraconfig%2Ftasks%2Fyum_update.sh;h=e32369e1b65e776c6140cd3e26464122f8fd6666;hb=f5854e1b5850dc50e51bc36ed4840d58be88d0cf;hp=69ff554342d03e0da10e6732a9401b18b1b210d5;hpb=d35f067ce1dc0bf48251f89cd1dcdeecbf35cc17;p=apex-tripleo-heat-templates.git

diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh
index 69ff5543..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,41 +121,11 @@ 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
     # mongod start timeout is higher, setting only stop timeout
-    pcs resource update mongod op stop timeout=100s
+    pcs -f $pacemaker_dumpfile resource update mongod op stop timeout=100s
 
     echo "Applying new Pacemaker config"
     pcs cluster cib-push $pacemaker_dumpfile
@@ -136,6 +138,13 @@ openstack-nova-scheduler"
     else
         pcs cluster stop
     fi
+
+    # clean leftover keepalived and radvd instances from neutron
+    # (can be removed when we remove neutron-netns-cleanup from cluster services)
+    # see https://review.gerrithub.io/#/c/248931/1/neutron-netns-cleanup.init
+    killall neutron-keepalived-state-change 2>/dev/null || :
+    kill $(ps ax | grep -e "keepalived.*\.pid-vrrp" | awk '{print $1}') 2>/dev/null || :
+    kill $(ps ax | grep -e "radvd.*\.pid\.radvd" | awk '{print $1}') 2>/dev/null || :
 else
     echo "Excluding upgrading packages that are handled by config management tooling"
     command_arguments="$command_arguments --skip-broken"