diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-13 14:44:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-13 14:44:26 +0000 |
| commit | 7db277b1459effca5e8b3a13090d7b08639346cc (patch) | |
| tree | bfeb9a85ac752c5848a6a89e74d4b824be1159ab /tools | |
| parent | 8d5080407e8accb114cf57c16023f3e7737f29cb (diff) | |
| parent | f0aa137a1d4b3009fd0aa6dc4d1a1cd23fa72f89 (diff) | |
| download | kolla-7db277b1459effca5e8b3a13090d7b08639346cc.tar.gz kolla-7db277b1459effca5e8b3a13090d7b08639346cc.zip | |
Merge "move ovs cleanup to tools/cleanup-host"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/cleanup-containers | 5 | ||||
| -rwxr-xr-x | tools/cleanup-host | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tools/cleanup-containers b/tools/cleanup-containers index 739621336..14249c960 100755 --- a/tools/cleanup-containers +++ b/tools/cleanup-containers @@ -16,11 +16,6 @@ else egrep -v '(^\s*$)' | sort | uniq) fi -echo "Removing ovs bridge..." -(docker exec -u root neutron_openvswitch_agent neutron-ovs-cleanup \ - --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \ - --ovs_all_ports) > /dev/null - echo "Stopping containers..." (docker stop -t 2 ${containers_to_kill} 2>&1) > /dev/null diff --git a/tools/cleanup-host b/tools/cleanup-host index c50a3a287..59d463b22 100755 --- a/tools/cleanup-host +++ b/tools/cleanup-host @@ -27,6 +27,11 @@ ip -o link show | awk -F': ' '/vxlan/{print $2}' | while read -r ifname ; do ip link delete $ifname type vxlan done +echo "Removing ovs bridge..." +(docker exec -u root neutron_openvswitch_agent neutron-ovs-cleanup \ + --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \ + --ovs_all_ports) > /dev/null + # Keepalived leaves VIP on the host in case of accidental removal. # This snippet removes VIPs. if [[ "$enable_haproxy" == "yes" ]]; then @@ -57,3 +62,4 @@ for dir in $FOLDER_PATH*; do rm -rfv $dir fi done + |