diff options
Diffstat (limited to 'neutron/plugins/ml2/plugin.py')
| -rw-r--r-- | neutron/plugins/ml2/plugin.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index d29deda6ce..fe3a6face8 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -29,6 +29,7 @@ from neutron.api.rpc.handlers import securitygroups_rpc from neutron.api.v2 import attributes from neutron.common import constants as const from neutron.common import exceptions as exc +from neutron.common import ipv6_utils from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils @@ -726,7 +727,8 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, LOG.debug(_("Ports to auto-deallocate: %s"), allocated) only_auto_del = all(not a.port_id or a.ports.device_owner in db_base_plugin_v2. - AUTO_DELETE_PORT_OWNERS + AUTO_DELETE_PORT_OWNERS or + ipv6_utils.is_slaac_subnet(subnet) for a in allocated) if not only_auto_del: LOG.debug(_("Tenant-owned ports exist")) |