Browse code

Merge "Add cleanup for Linuxbridge-agent"

Jenkins authored on 2015/07/01 01:52:05
Showing 1 changed files
1 1
old mode 100644
2 2
new mode 100755
... ...
@@ -9,6 +9,20 @@ set +o xtrace
9 9
 
10 10
 function neutron_lb_cleanup {
11 11
     sudo brctl delbr $PUBLIC_BRIDGE
12
+
13
+    if [[ "$Q_ML2_TENANT_NETWORK_TYPE" = "vxlan" ]]; then
14
+        for port in $(sudo brctl show | grep -o -e [a-zA-Z\-]*tap[0-9a-f\-]* -e vxlan-[0-9a-f\-]*); do
15
+            sudo ip link delete $port
16
+        done
17
+    elif [[ "$Q_ML2_TENANT_NETWORK_TYPE" = "vlan" ]]; then
18
+        for port in $(sudo brctl show | grep -o -e [a-zA-Z\-]*tap[0-9a-f\-]* -e ${LB_PHYSICAL_INTERFACE}\.[0-9a-f\-]*); do
19
+            sudo ip link delete $port
20
+        done
21
+    fi
22
+    for bridge in $(sudo brctl show |grep -o -e brq[0-9a-f\-]*); do
23
+        sudo ip link set $bridge down
24
+        sudo brctl delbr $bridge
25
+    done
12 26
 }
13 27
 
14 28
 function is_neutron_ovs_base_plugin {