openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Update: clean keepalived and radvd instances after pcs cluster stop"

This commit is contained in:
Jenkins 2015-11-25 18:58:17 +00:00 committed by Gerrit Code Review
parent 66c4ecdbf1 0d12f977e6
commit 80d929c75f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extraconfig/tasks/yum_update.sh
View File

@ -136,6 +136,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"