x/vmware-nsx
Code Issues Proposed changes

Merge "Fix linux bridge section name Bug #1006684"

Browse Source
This commit is contained in:
Jenkins 2012-06-04 14:04:56 +00:00 committed by Gerrit Code Review
commit e03cc6cbdc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
View File

@ -481,7 +481,7 @@ def main():
config_file = args[0]
conf = config.parse(config_file)
br_name_prefix = BRIDGE_NAME_PREFIX
physical_interface = conf.BRIDGE.physical_interface
physical_interface = conf.LINUX_BRIDGE.physical_interface
polling_interval = conf.AGENT.polling_interval
reconnect_interval = conf.DATABASE.reconnect_interval
root_helper = conf.AGENT.root_helper

2
quantum/plugins/linuxbridge/common/config.py
View File

@ -45,6 +45,6 @@ def parse(config_file):
conf(args=[])
conf.register_opts(vlan_opts, "VLANS")
conf.register_opts(database_opts, "DATABASE")
conf.register_opts(bridge_opts, "BRIDGE")
conf.register_opts(bridge_opts, "LINUX_BRIDGE")
conf.register_opts(agent_opts, "AGENT")
return conf