openstack/zun
Code Issues Proposed changes

Merge "Fix zun delete fail as port not exist."

Browse Source
This commit is contained in:
Jenkins 2017-04-27 17:18:22 +00:00 committed by Gerrit Code Review
commit 31fbbff91f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zun/network/kuryr_network.py
View File

@ -13,6 +13,7 @@
import ipaddress
import six
from neutronclient.common import exceptions
from oslo_log import log as logging
from zun.common import clients
@ -158,5 +159,11 @@ class KuryrNetwork(network.Network):
self.docker.disconnect_container_from_network(container_id,
network_name)
if neutron_ports:
port_id = neutron_ports[0]['id']
self.neutron.delete_port(port_id)
try:
port_id = neutron_ports[0]['id']
self.neutron.delete_port(port_id)
except exceptions.PortNotFoundClient:
LOG.warning('Maybe your libnetwork distribution do not have'
'patch https://review.openstack.org/#/c/441024/'
'or neutron tag extension does not supported or'
' not enabled.')