Merge "Typographical correction of Arista ML2 help"

This commit is contained in:
Jenkins
2014-04-13 23:22:13 +00:00
committed by Gerrit Code Review

View File

@@ -28,42 +28,43 @@ OpenStack/Neutron controllers.
ARISTA_DRIVER_OPTS = [ ARISTA_DRIVER_OPTS = [
cfg.StrOpt('eapi_username', cfg.StrOpt('eapi_username',
default='', default='',
help=_('Username for Arista EOS. This is required field.' help=_('Username for Arista EOS. This is required field. '
'if not set, all communications to Arista EOS' 'If not set, all communications to Arista EOS'
'will fail')), 'will fail.')),
cfg.StrOpt('eapi_password', cfg.StrOpt('eapi_password',
default='', default='',
secret=True, # do not expose value in the logs secret=True, # do not expose value in the logs
help=_('Password for Arista EOS. This is required field.' help=_('Password for Arista EOS. This is required field. '
'if not set, all communications to Arista EOS' 'If not set, all communications to Arista EOS '
'will fail')), 'will fail.')),
cfg.StrOpt('eapi_host', cfg.StrOpt('eapi_host',
default='', default='',
help=_('Arista EOS IP address. This is required field.' help=_('Arista EOS IP address. This is required field. '
'If not set, all communications to Arista EOS' 'If not set, all communications to Arista EOS'
'will fail')), 'will fail.')),
cfg.BoolOpt('use_fqdn', cfg.BoolOpt('use_fqdn',
default=True, default=True,
help=_('Defines if hostnames are sent to Arista EOS as FQDNs' help=_('Defines if hostnames are sent to Arista EOS as FQDNs '
'("node1.domain.com") or as short names ("node1").' '("node1.domain.com") or as short names ("node1"). '
'This is optional. If not set, a value of "True"' 'This is optional. If not set, a value of "True" '
'is assumed.')), 'is assumed.')),
cfg.IntOpt('sync_interval', cfg.IntOpt('sync_interval',
default=180, default=180,
help=_('Sync interval in seconds between Neutron plugin and' help=_('Sync interval in seconds between Neutron plugin and '
'EOS. This interval defines how often the' 'EOS. This interval defines how often the '
'synchronization is performed. This is an optional' 'synchronization is performed. This is an optional '
'field. If not set, a value of 180 seconds is assumed')), 'field. If not set, a value of 180 seconds is '
'assumed.')),
cfg.StrOpt('region_name', cfg.StrOpt('region_name',
default='RegionOne', default='RegionOne',
help=_('Defines Region Name that is assigned to this OpenStack' help=_('Defines Region Name that is assigned to this OpenStack '
'Controller. This is useful when multiple' 'Controller. This is useful when multiple '
'OpenStack/Neutron controllers are managing the same' 'OpenStack/Neutron controllers are managing the same '
'Arista HW clusters. Note that this name must match with' 'Arista HW clusters. Note that this name must match '
'the region name registered (or known) to keystone' 'with the region name registered (or known) to keystone '
'service. Authentication with Keysotne is performed by' 'service. Authentication with Keysotne is performed by '
'EOS. This is optional. If not set, a value of' 'EOS. This is optional. If not set, a value of '
'"RegionOne" is assumed')) '"RegionOne" is assumed.'))
] ]
cfg.CONF.register_opts(ARISTA_DRIVER_OPTS, "ml2_arista") cfg.CONF.register_opts(ARISTA_DRIVER_OPTS, "ml2_arista")