Merge "neutron-cleanup skips ports marked skip_cleanup=true"

docker/services/neutron/neutron-cleanup

@@ -10,11 +10,17 @@ then
     TUN_BRIDGE=`crudini --get ${NEUTRON_OVS_CONF} ovs tunnel_bridge`
 fi
 
-for br in ${INT_BRIDGE:-"br-int"} ${TUN_BRIDGE:-"br-tun"};
+for port in `ovs-vsctl list-ports ${INT_BRIDGE:-"br-int"}`;
 do
-    ovs-vsctl --if-exists del-br $br
+    skip_cleanup=`ovs-vsctl --if-exists get Interface $port external_ids:skip_cleanup`
+    if ! [[ "x$skip_cleanup" == "x\"true\"" ]];
+    then
+        ovs-vsctl del-port ${INT_BRIDGE:-"br-int"} $port
+    fi
 done
 
+ovs-vsctl --if-exists del-br ${TUN_BRIDGE:-"br-tun"}
+
 # Clean up trunk port bridges
 for br in $(ovs-vsctl list-br | egrep 'tbr-[0-9a-f\-]+'); do
     ovs-vsctl --if-exists del-br $br