Merge "Check container_id when disconnecting its network"

This commit is contained in:
Zuul
2018-01-11 07:57:37 +00:00
committed by Gerrit Code Review

View File

@@ -299,8 +299,9 @@ class KuryrNetwork(network.Network):
neutron_ports.add(port_id)
try:
self.docker.disconnect_container_from_network(container_id,
network_name)
if container_id:
self.docker.disconnect_container_from_network(container_id,
network_name)
finally:
for port_id in all_ports:
try: