openstack
/
neutron
Code Issues Proposed changes

Merge "Fix deletion of subnet_id from pd_subnets" into stable/stein

This commit is contained in:
Zuul 2020-08-27 12:00:42 +00:00 committed by Gerrit Code Review
parent 645a94d7fd 907bd92595
commit 758e7a94c3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/l3/router_info.py
View File

@ -588,7 +588,7 @@ class RouterInfo(object):
for subnet in p['subnets']: for subnet in p['subnets']:
if ipv6_utils.is_ipv6_pd_enabled(subnet): if ipv6_utils.is_ipv6_pd_enabled(subnet):
self.agent.pd.disable_subnet(self.router_id, subnet['id']) self.agent.pd.disable_subnet(self.router_id, subnet['id'])
del self.pd_subnets[subnet['id']] self.pd_subnets.pop(subnet['id'], None)
for p in new_ports: for p in new_ports:
self.internal_network_added(p) self.internal_network_added(p)