openstack
/
neutron
Code Issues Proposed changes

Merge "Remove an external interface when router-gateway is removed."

This commit is contained in:
Jenkins 2012-09-11 01:12:11 +00:00 committed by Gerrit Code Review
parent ba684d7ac2 cb38773cc7
commit 39b74e42ec
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
quantum/agent/l3_agent.py
View File

@ -202,7 +202,8 @@ class L3NATAgent(object):
if not r['admin_state_up']:
continue
ex_net_id = r['external_gateway_info'].get('network_id', None)
ex_net_id = (r['external_gateway_info'] and
r['external_gateway_info'].get('network_id'))
if not ex_net_id and not self.conf.handle_internal_only_routers:
continue
@ -381,7 +382,8 @@ class L3NATAgent(object):
if ip_lib.device_exists(interface_name,
root_helper=self.conf.root_helper,
namespace=ri.ns_name()):
self.driver.unplug(interface_name)
self.driver.unplug(interface_name,
bridge=self.conf.external_network_bridge)
ex_gw_ip = ex_gw_port['fixed_ips'][0]['ip_address']
for c, r in self.external_gateway_filter_rules():