x/vmware-nsx
Code Issues Proposed changes

Merge "Fix flag name for l3 agent external network id"

Browse Source
This commit is contained in:
Jenkins 2012-09-27 07:39:42 +00:00 committed by Gerrit Code Review
commit 90aff020d6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/l3_agent.ini
View File

@ -34,7 +34,7 @@ root_helper = sudo
# value should be set to the UUID of that external network. If empty, # value should be set to the UUID of that external network. If empty,
# the agent will enforce that only a single external networks exists and # the agent will enforce that only a single external networks exists and
# use that external network id # use that external network id
# gateway_external_net_id = # gateway_external_network_id =
# Indicates that this L3 agent should also handle routers that do not have # Indicates that this L3 agent should also handle routers that do not have
# an external network gateway configured. This option should be True only # an external network gateway configured. This option should be True only

2
quantum/agent/l3_agent.py
View File

@ -181,7 +181,7 @@ class L3NATAgent(object):
params = {'router:external': True} params = {'router:external': True}
ex_nets = self.qclient.list_networks(**params)['networks'] ex_nets = self.qclient.list_networks(**params)['networks']
if len(ex_nets) > 1: if len(ex_nets) > 1:
raise Exception("must configure 'external_network_id' if " raise Exception("must configure 'gateway_external_network_id' if "
"Quantum has more than one external network.") "Quantum has more than one external network.")
if len(ex_nets) == 0: if len(ex_nets) == 0:
return None return None