diff --git a/etc/neutron/plugins/brocade/brocade.ini b/etc/neutron/plugins/brocade/brocade.ini index 6501c1b213..9acd1d990a 100644 --- a/etc/neutron/plugins/brocade/brocade.ini +++ b/etc/neutron/plugins/brocade/brocade.ini @@ -1,8 +1,8 @@ [switch] -# username = -# password = -# address = -# ostype = NOS +# username = The SSH username to use +# password = The SSH password to use +# address = The address of the host to SSH to +# ostype = Should be NOS, but is unused otherwise # # Example: # username = admin @@ -11,7 +11,7 @@ # ostype = NOS [physical_interface] -# physical_interface = +# physical_interface = The network interface to use when creating a port # # Example: # physical_interface = physnet1 diff --git a/neutron/plugins/brocade/NeutronPlugin.py b/neutron/plugins/brocade/NeutronPlugin.py index 2f0a169b77..d2f137c651 100644 --- a/neutron/plugins/brocade/NeutronPlugin.py +++ b/neutron/plugins/brocade/NeutronPlugin.py @@ -59,13 +59,19 @@ PLUGIN_VERSION = 0.88 AGENT_OWNER_PREFIX = "network:" NOS_DRIVER = 'neutron.plugins.brocade.nos.nosdriver.NOSdriver' -SWITCH_OPTS = [cfg.StrOpt('address', default=''), - cfg.StrOpt('username', default=''), - cfg.StrOpt('password', default='', secret=True), - cfg.StrOpt('ostype', default='NOS') +SWITCH_OPTS = [cfg.StrOpt('address', default='', + help=_('The address of the host to SSH to')), + cfg.StrOpt('username', default='', + help=_('The SSH username to use')), + cfg.StrOpt('password', default='', secret=True, + help=_('The SSH password to use')), + cfg.StrOpt('ostype', default='NOS', + help=_('Currently unused')) ] -PHYSICAL_INTERFACE_OPTS = [cfg.StrOpt('physical_interface', default='eth0') +PHYSICAL_INTERFACE_OPTS = [cfg.StrOpt('physical_interface', default='eth0', + help=_('The network interface to use when creating' + 'a port')) ] cfg.CONF.register_opts(SWITCH_OPTS, "SWITCH")