openstack
/
ironic-inspector
Code Issues Proposed changes

Merge "Add translation marker to deprecated_reason of config opts"

This commit is contained in:
Jenkins 2016-09-13 17:03:39 +00:00 committed by Gerrit Code Review
parent af3bf3210b 5f4015be61
commit 7ea229ad7c
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ironic_inspector/common/ironic.py
View File

@ -42,8 +42,8 @@ IRONIC_OPTS = [
'token validation.'),
deprecated_group='discoverd',
deprecated_for_removal=True,
deprecated_reason='Use options presented by configured '
'keystone auth plugin.'),
deprecated_reason=_('Use options presented by configured '
'keystone auth plugin.')),
cfg.StrOpt('os_username',
default='',
help=_('User name for accessing Ironic API. '
@ -51,8 +51,8 @@ IRONIC_OPTS = [
'token validation.'),
deprecated_group='discoverd',
deprecated_for_removal=True,
deprecated_reason='Use options presented by configured '
'keystone auth plugin.'),
deprecated_reason=_('Use options presented by configured '
'keystone auth plugin.')),
cfg.StrOpt('os_password',
default='',
help=_('Password for accessing Ironic API. '
@ -61,8 +61,8 @@ IRONIC_OPTS = [
secret=True,
deprecated_group='discoverd',
deprecated_for_removal=True,
deprecated_reason='Use options presented by configured '
'keystone auth plugin.'),
deprecated_reason=_('Use options presented by configured '
'keystone auth plugin.')),
cfg.StrOpt('os_tenant_name',
default='',
help=_('Tenant name for accessing Ironic API. '
@ -70,8 +70,8 @@ IRONIC_OPTS = [
'token validation.'),
deprecated_group='discoverd',
deprecated_for_removal=True,
deprecated_reason='Use options presented by configured '
'keystone auth plugin.'),
deprecated_reason=_('Use options presented by configured '
'keystone auth plugin.')),
cfg.StrOpt('identity_uri',
default='',
help=_('Keystone admin endpoint. '

8
ironic_inspector/common/swift.py
View File

@ -46,14 +46,14 @@ SWIFT_OPTS = [
default='2',
help=_('Keystone authentication API version'),
deprecated_for_removal=True,
deprecated_reason='Use options presented by configured '
'keystone auth plugin.'),
deprecated_reason=_('Use options presented by configured '
'keystone auth plugin.')),
cfg.StrOpt('os_auth_url',
default='',
help=_('Keystone authentication URL'),
deprecated_for_removal=True,
deprecated_reason='Use options presented by configured '
'keystone auth plugin.'),
deprecated_reason=_('Use options presented by configured '
'keystone auth plugin.')),
cfg.StrOpt('os_service_type',
default='object-store',
help=_('Swift service type.')),