summaryrefslogtreecommitdiffstats
path: root/extraconfig
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-25 18:58:17 +0000
committerGerrit Code Review <review@openstack.org>2015-11-25 18:58:17 +0000
commit80d929c75f979d99d4e608aae790f38786b4e055 (patch)
tree1ab0dd1409a160a579680623cea8ac26fdd93ef6 /extraconfig
parent66c4ecdbf1640cfe3e74d736ec1fa2dd4580ff1f (diff)
parent0d12f977e6c59f0425da24edbffc0632fcae71b4 (diff)
Merge "Update: clean keepalived and radvd instances after pcs cluster stop"
Diffstat (limited to 'extraconfig')
-rwxr-xr-xextraconfig/tasks/yum_update.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh
index 69ff5543..e3e9545d 100755
--- a/extraconfig/tasks/yum_update.sh
+++ b/extraconfig/tasks/yum_update.sh
@@ -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"