openstack
/
neutron
Code Issues Proposed changes

Merge "Expose OVS bridge related options into metering agent config file"

This commit is contained in:
Jenkins 2016-11-22 08:37:08 +00:00 committed by Gerrit Code Review
parent f0575dc1ba a8e1badbd2
commit 377a5c2362
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/oslo-config-generator/dhcp_agent.ini
View File

@ -2,6 +2,7 @@
output_file = etc/dhcp_agent.ini.sample
wrap_width = 79
namespace = neutron.az.agent
namespace = neutron.base.agent
namespace = neutron.dhcp.agent
namespace = oslo.log

1
etc/oslo-config-generator/l3_agent.ini
View File

@ -2,6 +2,7 @@
output_file = etc/l3_agent.ini.sample
wrap_width = 79
namespace = neutron.az.agent
namespace = neutron.base.agent
namespace = neutron.l3.agent
namespace = oslo.log

1
etc/oslo-config-generator/metering_agent.ini
View File

@ -2,5 +2,6 @@
output_file = etc/metering_agent.ini.sample
wrap_width = 79
namespace = neutron.base.agent
namespace = neutron.metering.agent
namespace = oslo.log

18
neutron/opts.py
View File

@ -155,11 +155,13 @@ def list_base_agent_opts():
neutron.agent.common.config.INTERFACE_DRIVER_OPTS,
neutron.conf.agent.ovs_conf.OPTS)
),
('AGENT',
itertools.chain(
neutron.agent.common.config.AGENT_STATE_OPTS,
neutron.agent.common.config.AVAILABILITY_ZONE_OPTS)
)
('AGENT', neutron.agent.common.config.AGENT_STATE_OPTS),
]
def list_az_agent_opts():
return [
('AGENT', neutron.agent.common.config.AVAILABILITY_ZONE_OPTS),
]
@ -229,11 +231,7 @@ def list_metadata_agent_opts():
def list_metering_agent_opts():
return [
('DEFAULT',
itertools.chain(
neutron.conf.services.metering_agent.metering_agent_opts,
neutron.agent.common.config.INTERFACE_DRIVER_OPTS)
)
('DEFAULT', neutron.conf.services.metering_agent.metering_agent_opts),
]

1
setup.cfg
View File

@ -129,6 +129,7 @@ oslo.messaging.notify.drivers =
oslo.config.opts =
neutron = neutron.opts:list_opts
neutron.agent = neutron.opts:list_agent_opts
neutron.az.agent = neutron.opts:list_az_agent_opts
neutron.base.agent = neutron.opts:list_base_agent_opts
neutron.db = neutron.opts:list_db_opts
neutron.dhcp.agent = neutron.opts:list_dhcp_agent_opts