Merge "Fix attribute errors in os-auth-* settings"
This commit is contained in:
commit
e3743623c3
@ -143,9 +143,8 @@ class OpenStackCinderShell(object):
|
|||||||
parser.add_argument('--os-auth-system',
|
parser.add_argument('--os-auth-system',
|
||||||
metavar='<os-auth-system>',
|
metavar='<os-auth-system>',
|
||||||
dest='os_auth_type',
|
dest='os_auth_type',
|
||||||
default=utils.env('OS_AUTH_SYSTEM',
|
default=utils.env('OS_AUTH_SYSTEM'),
|
||||||
default=utils.env('OS_AUTH_TYPE')),
|
help=_('DEPRECATED! Use --os-auth-type. '
|
||||||
help=_('DEPRECATED! Use --os-auth-type.'
|
|
||||||
'Defaults to env[OS_AUTH_SYSTEM].'))
|
'Defaults to env[OS_AUTH_SYSTEM].'))
|
||||||
parser.add_argument('--os_auth_system',
|
parser.add_argument('--os_auth_system',
|
||||||
help=argparse.SUPPRESS)
|
help=argparse.SUPPRESS)
|
||||||
|
@ -363,14 +363,14 @@ def do_list(cs, args):
|
|||||||
"exercise caution when using. Default=None, that means the "
|
"exercise caution when using. Default=None, that means the "
|
||||||
"state is unchanged."))
|
"state is unchanged."))
|
||||||
@utils.arg('--attach-status', metavar='<attach-status>', default=None,
|
@utils.arg('--attach-status', metavar='<attach-status>', default=None,
|
||||||
help=('This only used in volume entity. The attach status to '
|
help=('This is only used for a volume entity. The attach status '
|
||||||
'assign to the volume in the DataBase, with no regard to '
|
'to assign to the volume in the database, with no regard '
|
||||||
'the actual status. Valid values are "attached" and '
|
'to the actual status. Valid values are "attached" and '
|
||||||
'"detached". Default=None, that means the status '
|
'"detached". Default=None, that means the status '
|
||||||
'is unchanged.'))
|
'is unchanged.'))
|
||||||
@utils.arg('--reset-migration-status',
|
@utils.arg('--reset-migration-status',
|
||||||
action='store_true',
|
action='store_true',
|
||||||
help=('This only used in volume entity. Clears the migration '
|
help=('This is only used for a volume entity. Clears the migration '
|
||||||
'status of the volume in the DataBase that indicates the '
|
'status of the volume in the DataBase that indicates the '
|
||||||
'volume is source or destination of volume migration, '
|
'volume is source or destination of volume migration, '
|
||||||
'with no regard to the actual status.'))
|
'with no regard to the actual status.'))
|
||||||
|
Loading…
Reference in New Issue
Block a user