]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
options: consolidate options definitions
authorIsaku Yamahata <isaku.yamahata@intel.com>
Thu, 13 Feb 2014 11:19:25 +0000 (20:19 +0900)
committerThomas Goirand <thomas@goirand.fr>
Thu, 13 Mar 2014 07:20:30 +0000 (15:20 +0800)
commit07c758fd5da89fc2360634bd72e2b920cb7d452e
treece992b5f50a763e01e04049a87216bf3d3ce9763
parent1a54cd42394cc1ab62f618e890b8cb4e31e541d4
options: consolidate options definitions

Some config options(interface_driver, use_namespaces) are defined
multiple times in ad-hoc way.  It causes DuplicateOptError exception
when using those module at the same time.  Right now the exception is
avoided in ad-hoc way by each executable.  Those duplicated
definitions should be consolidated and treated in uniformed way.

This is the blocker for blueprint: l3-agent-consolidation

neutron.services.loadbalancer.drivers.haproxy.agent periodic_interval
conflicts with neutron.service one. Since there is no way to fix it
without changing existing behavior/default value, it is untouched for now.

Closes-bug: #1279769
Change-Id: Ifed79b7ee0033644854499416f8a2b22a20416fe
22 files changed:
neutron/agent/common/config.py
neutron/agent/dhcp_agent.py
neutron/agent/l3_agent.py
neutron/agent/linux/dhcp.py
neutron/agent/netns_cleanup_util.py
neutron/agent/ovs_cleanup_util.py
neutron/debug/debug_agent.py
neutron/debug/shell.py
neutron/services/firewall/agents/varmour/varmour_router.py
neutron/services/loadbalancer/agent/agent.py
neutron/services/loadbalancer/agent/agent_manager.py
neutron/services/metering/drivers/iptables/iptables_driver.py
neutron/tests/unit/midonet/test_midonet_driver.py
neutron/tests/unit/services/firewall/agents/l3reference/test_firewall_l3_agent.py
neutron/tests/unit/services/firewall/agents/varmour/test_varmour_router.py
neutron/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py
neutron/tests/unit/services/vpn/test_vpn_agent.py
neutron/tests/unit/test_debug_commands.py
neutron/tests/unit/test_dhcp_agent.py
neutron/tests/unit/test_l3_agent.py
neutron/tests/unit/test_linux_dhcp.py
neutron/tests/unit/test_linux_interface.py