openstack/neutron
Code Issues Proposed changes

Moved the configuration variables.

Browse Source 
Moved the configuration variables from dhcp agent
to linux interface so l3-agent works with
Metadriver.

Also removed the unnecessary configuration variables
from quantum debug agent because of the above
modification.

Fixes: bug #1138757

Change-Id: Ib23fee18a08ef1c531feb05d98c9a76f5385a4ff
This commit is contained in:
Jason Zhang 2013-03-04 11:45:22 -08:00
parent 99761bca31
commit e91818b378
3 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
quantum/agent/dhcp_agent.py
View File

@ -455,19 +455,6 @@ class NetworkCache(object):
class DeviceManager(object):
OPTS = [
cfg.StrOpt('admin_user',
help=_("Admin username")),
cfg.StrOpt('admin_password',
help=_("Admin password"),
secret=True),
cfg.StrOpt('admin_tenant_name',
help=_("Admin tenant name")),
cfg.StrOpt('auth_url',
help=_("Authentication URL")),
cfg.StrOpt('auth_strategy', default='keystone',
help=_("The type of authentication to use")),
cfg.StrOpt('auth_region',
help=_("Authentication region")),
cfg.StrOpt('interface_driver',
help=_("The driver used to manage the virtual interface."))
]

15
quantum/agent/linux/interface.py
View File

@ -42,7 +42,20 @@ OPTS = [
cfg.StrOpt('network_device_mtu',
help=_('MTU setting for device.')),
cfg.StrOpt('meta_flavor_driver_mappings',
help=_('Mapping between flavor and LinuxInterfaceDriver'))
help=_('Mapping between flavor and LinuxInterfaceDriver')),
cfg.StrOpt('admin_user',
help=_("Admin username")),
cfg.StrOpt('admin_password',
help=_("Admin password"),
secret=True),
cfg.StrOpt('admin_tenant_name',
help=_("Admin tenant name")),
cfg.StrOpt('auth_url',
help=_("Authentication URL")),
cfg.StrOpt('auth_strategy', default='keystone',
help=_("The type of authentication to use")),
cfg.StrOpt('auth_region',
help=_("Authentication region")),
]

13
quantum/debug/debug_agent.py
View File

@ -37,19 +37,6 @@ class QuantumDebugAgent():
OPTS = [
# Needed for drivers
cfg.StrOpt('admin_user',
help=_("Admin user")),
cfg.StrOpt('admin_password',
help=_("Admin password"),
secret=True),
cfg.StrOpt('admin_tenant_name',
help=_("Admin tenant name")),
cfg.StrOpt('auth_url',
help=_("Authentication URL")),
cfg.StrOpt('auth_strategy', default='keystone',
help=_("The type of authentication to use")),
cfg.StrOpt('auth_region',
help=_("Authentication region")),
cfg.BoolOpt('use_namespaces', default=True,
help=_("Use Linux network namespaces")),
cfg.StrOpt('interface_driver',