openstack
/
neutron
Code Issues Proposed changes

Merge "Add block name to switch config options for MLX plug-ins."

This commit is contained in:
Jenkins 2015-04-24 01:09:06 +00:00 committed by Gerrit Code Review
parent 40f7aeacad 594353722c
commit dfcfbff4db
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/neutron/plugins/brocade/brocade_mlx.ini
View File

@ -3,7 +3,7 @@
# Example:
# switch_names = mlx
# [EXAMPLE_SWITCH]
[L3_BROCADE_MLX_EXAMPLE]
# address = The IP address of the MLX switch
# username = The SSH username to use to connect to device
# password = The SSH password to use to connect to device

2
etc/neutron/plugins/ml2/ml2_conf_brocade_fi_ni.ini
View File

@ -3,7 +3,7 @@
# Example:
# switch_names = icx-1, icx-2
# [switch-name-1]
[ML2_BROCADE_MLX_EXAMPLE]
# address = The address of the host to SSH to
# username = The username to use to connect to device
# password = The password to use to connect to device

2
neutron/plugins/ml2/drivers/brocade/fi_ni/mechanism_brocade_fi_ni.py
View File

@ -41,10 +41,10 @@ ML2_BROCADE = [cfg.StrOpt('address', default='',
help=('OS type of the device.')),
]
cfg.CONF.register_opts(SWITCHES, 'ml2_brocade_fi_ni')
cfg.CONF.register_opts(ML2_BROCADE, 'ML2_BROCADE_MLX_EXAMPLE')
class BrocadeFiNiMechanism(mechanism_brocade_fi_ni.BrocadeFiNiMechanism):
def __init__(self):
self._switch_names = cfg.CONF.ml2_brocade_fi_ni.switch_names
switches = [x.strip() for x in self._switch_names.split(',')]

1
neutron/services/l3_router/brocade/mlx/l3_router_plugin.py
View File

@ -39,6 +39,7 @@ L3_BROCADE = [cfg.StrOpt('address', default='',
'configured on the switch')),
]
cfg.CONF.register_opts(SWITCHES, 'l3_brocade_mlx')
cfg.CONF.register_opts(L3_BROCADE, 'L3_BROCADE_MLX_EXAMPLE')
class BrocadeRouterPlugin(plugin.BrocadeRouterPlugin):