From 5c0fc495ffcb0f40294f39f3706648484cf00be0 Mon Sep 17 00:00:00 2001 From: Yong Sheng Gong Date: Wed, 30 May 2012 13:59:52 +0800 Subject: [PATCH] Fix linux bridge section name Bug #1006684 Change-Id: Ic7a97179d6fbb90f8c7f544a5725e1ff56fd9653 --- quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py | 2 +- quantum/plugins/linuxbridge/common/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py index 1d5887afb..bb1e036a9 100755 --- a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py +++ b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py @@ -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 diff --git a/quantum/plugins/linuxbridge/common/config.py b/quantum/plugins/linuxbridge/common/config.py index 486929557..c4f51f7bc 100644 --- a/quantum/plugins/linuxbridge/common/config.py +++ b/quantum/plugins/linuxbridge/common/config.py @@ -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 -- 2.45.2