openstack
/
magnum
Code Issues Proposed changes

Clean up miscellaneous help strings 

This patch makes some general cleanup changes to help strings to tidy
up various areas of the code. No functional impacts result from the
changes within this patch.

Closes-Bug: #1477837
Change-Id: I25a81059e974ac0083bb439f1cd37fb82157b3bb
This commit is contained in:
Joe Cropper 2015-07-24 00:32:11 -05:00
parent ffea73cfd3
commit 16688d42a7
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
magnum/api/app.py
View File

@ -21,10 +21,10 @@ from magnum.api import middleware
API_SERVICE_OPTS = [
cfg.IntOpt('port',
default=9511,
help='The port for the magnum API server'),
help='The port for the Magnum API server.'),
cfg.StrOpt('host',
default='127.0.0.1',
help='The listen IP for the magnum API server'),
help='The listen IP for the Magnum API server.'),
cfg.IntOpt('max_limit',
default=1000,
help='The maximum number of items returned in a single '

2
magnum/api/auth.py
View File

@ -24,7 +24,7 @@ AUTH_OPTS = [
cfg.BoolOpt('enable_authentication',
default=True,
help='This option enables or disables user authentication '
'via keystone. Default value is True.'),
'via Keystone. Default value is True.'),
]
CONF = cfg.CONF

2
magnum/api/validation.py
View File

@ -30,7 +30,7 @@ def enforce_bay_types(*bay_types):
bay.baymodel_id)
if baymodel.coe not in bay_types:
raise exception.InvalidParameterValue(
'cannot fulfill request with a %(bay_type)s bay, '
'Cannot fulfill request with a %(bay_type)s bay, '
'expecting a %(supported_bay_types)s bay.' %
{'bay_type': baymodel.coe,
'supported_bay_types': '/'.join(bay_types)})

2
magnum/conductor/config.py
View File

@ -20,7 +20,7 @@ from oslo_config import cfg
SERVICE_OPTS = [
cfg.StrOpt('topic',
default='magnum-conductor',
help='The queue to add conductor tasks to'),
help='The queue to add conductor tasks to.'),
cfg.IntOpt('conductor_life_check_timeout',
default=4,
help=('RPC timeout for the conductor liveness check that is '

2
magnum/conductor/scale_manager.py
View File

@ -42,7 +42,7 @@ class ScaleManager(object):
hosts = hosts_output.get_output_value(stack)
if hosts is None:
raise exception.MagnumException(_(
"output key '%(output_key)s' is missing from stack "
"Output key '%(output_key)s' is missing from stack "
"%(stack_id)s") % {'output_key': hosts_output.heat_output,
'stack_id': stack.id})

14
magnum/conductor/template_definition.py
View File

@ -36,12 +36,12 @@ template_def_opts = [
deprecated_name='template_path',
deprecated_group='bay_heat',
help=_(
'Location of template to build a k8s cluster on atomic. ')),
'Location of template to build a k8s cluster on atomic.')),
cfg.StrOpt('k8s_coreos_template_path',
default=paths.basedir_def('templates/heat-kubernetes/'
'kubecluster-coreos.yaml'),
help=_(
'Location of template to build a k8s cluster on coreos. ')),
'Location of template to build a k8s cluster on CoreOS.')),
cfg.StrOpt('coreos_discovery_token_url',
default=None,
deprecated_name='discovery_token_url',
@ -51,12 +51,12 @@ template_def_opts = [
default=paths.basedir_def('templates/docker-swarm/'
'swarm.yaml'),
help=_('Location of template to build a swarm '
'cluster on atomic. ')),
'cluster on atomic.')),
cfg.StrOpt('swarm_discovery_url_format',
default=None,
help=_('Format string to use for swarm discovery url. '
'Available values: bay_id, bay_uuid. '
'Example: "etcd://etcd.example.com/\%(bay_uuid)s" ')),
'Example: "etcd://etcd.example.com/\%(bay_uuid)s"')),
cfg.BoolOpt('public_swarm_discovery',
default=True,
help=_('Indicates Swarm discovery should use public '
@ -67,12 +67,12 @@ template_def_opts = [
cfg.StrOpt('mesos_ubuntu_template_path',
default=paths.basedir_def('templates/heat-mesos/'
'mesoscluster.yaml'),
help=_('Location of template to build a mesos cluster '
'on ubuntu. ')),
help=_('Location of template to build a Mesos cluster '
'on Ubuntu.')),
cfg.ListOpt('enabled_definitions',
default=['magnum_vm_atomic_k8s', 'magnum_vm_coreos_k8s',
'magnum_vm_atomic_swarm', 'magnum_vm_ubuntu_mesos'],
help=_('Enabled bay definition entry points. ')),
help=_('Enabled bay definition entry points.')),
]
cfg.CONF.register_opts(template_def_opts, group='bay')

8
magnum/service/periodic.py
View File

@ -74,7 +74,7 @@ class MagnumPeriodicTasks(periodic_task.PeriodicTasks):
bay.status = stack.stack_status
bay.save()
LOG.info(_LI("Sync up bay with id %(id)s from "
"%(old_status)s to %(status)s"),
"%(old_status)s to %(status)s."),
{'id': bay.id, 'old_status': old_status,
'status': bay.status})
@ -85,14 +85,14 @@ class MagnumPeriodicTasks(periodic_task.PeriodicTasks):
bay.destroy()
LOG.info(_LI("Bay with id %(id)s has been deleted due "
"to stack with id %(sid)s not found in "
"heat."),
"Heat."),
{'id': bay.id, 'sid': sid})
elif bay.status == bay_status.CREATE_IN_PROGRESS:
bay.status = bay_status.CREATE_FAILED
bay.save()
LOG.info(_LI("Bay with id %(id)s has been set to "
"%(status)s due to stack with id %(sid)s "
"not found in heat."),
"not found in Heat."),
{'id': bay.id, 'status': bay.status,
'sid': sid})
elif bay.status == bay_status.UPDATE_IN_PROGRESS:
@ -100,7 +100,7 @@ class MagnumPeriodicTasks(periodic_task.PeriodicTasks):
bay.save()
LOG.info(_LI("Bay with id %(id)s has been set to "
"%(status)s due to stack with id %(sid)s "
"not found in heat."),
"not found in Heat."),
{'id': bay.id, 'status': bay.status,
'sid': sid})