Merge "Fix help strings"

This commit is contained in:
Jenkins 2014-10-07 04:26:33 +00:00 committed by Gerrit Code Review
commit 01d70a2c8b
8 changed files with 18 additions and 17 deletions

View File

@ -32,8 +32,8 @@ API_SERVICE_OPTS = [
cfg.BoolOpt('enable_reverse_dns_lookup', cfg.BoolOpt('enable_reverse_dns_lookup',
default=False, default=False,
help=('Set it to False if your environment does not need ' help=('Set it to False if your environment does not need '
'or have dns server, otherwise it will delay the ' 'or have a DNS server, otherwise it will delay the '
'response from api.') 'response from the API.')
), ),
] ]

View File

@ -41,7 +41,7 @@ OPTS = [
default=False, default=False,
help='Requeue the sample on the collector sample queue ' help='Requeue the sample on the collector sample queue '
'when the collector fails to dispatch it. This is only valid ' 'when the collector fails to dispatch it. This is only valid '
'if the sample come from the notifier publisher'), 'if the sample come from the notifier publisher.'),
] ]
cfg.CONF.register_opts(OPTS, group="collector") cfg.CONF.register_opts(OPTS, group="collector")

View File

@ -30,26 +30,26 @@ opt_group = cfg.OptGroup(name='vmware',
OPTS = [ OPTS = [
cfg.StrOpt('host_ip', cfg.StrOpt('host_ip',
default='', default='',
help='IP address of the VMware Vsphere host'), help='IP address of the VMware Vsphere host.'),
cfg.StrOpt('host_username', cfg.StrOpt('host_username',
default='', default='',
help='Username of VMware Vsphere'), help='Username of VMware Vsphere.'),
cfg.StrOpt('host_password', cfg.StrOpt('host_password',
default='', default='',
help='Password of VMware Vsphere', help='Password of VMware Vsphere.',
secret=True), secret=True),
cfg.IntOpt('api_retry_count', cfg.IntOpt('api_retry_count',
default=10, default=10,
help='Number of times a VMware Vsphere API must be retried'), help='Number of times a VMware Vsphere API may be retried.'),
cfg.FloatOpt('task_poll_interval', cfg.FloatOpt('task_poll_interval',
default=0.5, default=0.5,
help='Sleep time in seconds for polling an ongoing async ' help='Sleep time in seconds for polling an ongoing async '
'task'), 'task.'),
cfg.StrOpt('wsdl_location', cfg.StrOpt('wsdl_location',
help='Optional vim service WSDL location ' help='Optional vim service WSDL location '
'e.g http://<server>/vimService.wsdl. ' 'e.g http://<server>/vimService.wsdl. '
'Optional over-ride to default location for bug ' 'Optional over-ride to default location for bug '
'work-arounds'), 'work-arounds.'),
] ]
cfg.CONF.register_group(opt_group) cfg.CONF.register_group(opt_group)

View File

@ -32,12 +32,13 @@ opt_group = cfg.OptGroup(name='xenapi',
xenapi_opts = [ xenapi_opts = [
cfg.StrOpt('connection_url', cfg.StrOpt('connection_url',
help='URL for connection to XenServer/Xen Cloud Platform'), help='URL for connection to XenServer/Xen Cloud Platform.'),
cfg.StrOpt('connection_username', cfg.StrOpt('connection_username',
default='root', default='root',
help='Username for connection to XenServer/Xen Cloud Platform'), help='Username for connection to XenServer/Xen Cloud '
'Platform.'),
cfg.StrOpt('connection_password', cfg.StrOpt('connection_password',
help='Password for connection to XenServer/Xen Cloud Platform', help='Password for connection to XenServer/Xen Cloud Platform.',
secret=True), secret=True),
cfg.IntOpt('login_timeout', cfg.IntOpt('login_timeout',
default=10, default=10,

View File

@ -37,7 +37,7 @@ OPTS = [
cfg.FloatOpt('heartbeat', cfg.FloatOpt('heartbeat',
default=1.0, default=1.0,
help='Number of seconds between heartbeats for distributed ' help='Number of seconds between heartbeats for distributed '
'coordination (float)') 'coordination.')
] ]
cfg.CONF.register_opts(OPTS, group='coordination') cfg.CONF.register_opts(OPTS, group='coordination')

View File

@ -24,7 +24,7 @@ from ceilometer import sample
OPTS = [ OPTS = [
cfg.StrOpt('sahara_control_exchange', cfg.StrOpt('sahara_control_exchange',
default='sahara', default='sahara',
help="Exchange name for Data Processing notifications"), help="Exchange name for Data Processing notifications."),
] ]
cfg.CONF.register_opts(OPTS) cfg.CONF.register_opts(OPTS)

View File

@ -25,13 +25,13 @@ LOG = log.getLogger(__name__)
OPTS = [ OPTS = [
cfg.StrOpt('url_scheme', cfg.StrOpt('url_scheme',
default='snmp://', default='snmp://',
help='URL scheme to use for hardware nodes'), help='URL scheme to use for hardware nodes.'),
cfg.StrOpt('readonly_user_name', cfg.StrOpt('readonly_user_name',
default='ro_snmp_user', default='ro_snmp_user',
help='SNMPd user name of all nodes running in the cloud.'), help='SNMPd user name of all nodes running in the cloud.'),
cfg.StrOpt('readonly_user_password', cfg.StrOpt('readonly_user_password',
default='password', default='password',
help='SNMPd password of all the nodes running in the cloud'), help='SNMPd password of all the nodes running in the cloud.'),
] ]
cfg.CONF.register_opts(OPTS, group='hardware') cfg.CONF.register_opts(OPTS, group='hardware')

View File

@ -23,7 +23,7 @@ from ceilometer import sample
OPTS = [ OPTS = [
cfg.StrOpt('trove_control_exchange', cfg.StrOpt('trove_control_exchange',
default='trove', default='trove',
help="Exchange name for DBaaS notifications"), help="Exchange name for DBaaS notifications."),
] ]
cfg.CONF.register_opts(OPTS) cfg.CONF.register_opts(OPTS)