openstack/neutron
Code Issues Proposed changes

Merge "Modified configuration group name to lowercase"

Browse Source
This commit is contained in:
Jenkins 2013-10-29 09:28:19 +00:00 committed by Gerrit Code Review
commit 9073e04f57
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/neutron/plugins/plumgrid/plumgrid.ini
View File

@ -1,6 +1,6 @@
# Config file for Neutron PLUMgrid Plugin # Config file for Neutron PLUMgrid Plugin
[PLUMgridDirector] [plumgriddirector]
# This line should be pointing to the PLUMgrid Director, # This line should be pointing to the PLUMgrid Director,
# for the PLUMgrid platform. # for the PLUMgrid platform.
# director_server=<director-ip-address> # director_server=<director-ip-address>

12
neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py
View File

@ -53,7 +53,7 @@ director_server_opts = [
cfg.IntOpt('servertimeout', default=5, cfg.IntOpt('servertimeout', default=5,
help=_("PLUMgrid Director server timeout")), ] help=_("PLUMgrid Director server timeout")), ]
cfg.CONF.register_opts(director_server_opts, "PLUMgridDirector") cfg.CONF.register_opts(director_server_opts, "plumgriddirector")
class NeutronPluginPLUMgridV2(db_base_plugin_v2.NeutronDbPluginV2, class NeutronPluginPLUMgridV2(db_base_plugin_v2.NeutronDbPluginV2,
@ -80,11 +80,11 @@ class NeutronPluginPLUMgridV2(db_base_plugin_v2.NeutronDbPluginV2,
def plumgrid_init(self): def plumgrid_init(self):
"""PLUMgrid initialization.""" """PLUMgrid initialization."""
director_plumgrid = cfg.CONF.PLUMgridDirector.director_server director_plumgrid = cfg.CONF.plumgriddirector.director_server
director_port = cfg.CONF.PLUMgridDirector.director_server_port director_port = cfg.CONF.plumgriddirector.director_server_port
director_admin = cfg.CONF.PLUMgridDirector.username director_admin = cfg.CONF.plumgriddirector.username
director_password = cfg.CONF.PLUMgridDirector.password director_password = cfg.CONF.plumgriddirector.password
timeout = cfg.CONF.PLUMgridDirector.servertimeout timeout = cfg.CONF.plumgriddirector.servertimeout
# PLUMgrid Director info validation # PLUMgrid Director info validation
LOG.info(_('Neutron PLUMgrid Director: %s'), director_plumgrid) LOG.info(_('Neutron PLUMgrid Director: %s'), director_plumgrid)