diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-01 21:32:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-01 21:32:06 +0000 |
| commit | e3743623c31fbc4b3a0f2f9fd608d168fec79355 (patch) | |
| tree | 00030db1aea7f808d1ef91aa9321ef1dcc5ef0c0 | |
| parent | b9a968f96dc0ac2a819d14149c57e6e4fad557fa (diff) | |
| parent | 7a0694084fa3538f7b72c7d4bfe283dca320d151 (diff) | |
| download | python-cinderclient-2.2.0.tar.gz | |
Merge "Fix attribute errors in os-auth-* settings"2.2.0
| -rw-r--r-- | cinderclient/shell.py | 5 | ||||
| -rw-r--r-- | cinderclient/v3/shell.py | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/cinderclient/shell.py b/cinderclient/shell.py index 6307fdb..d36294b 100644 --- a/cinderclient/shell.py +++ b/cinderclient/shell.py @@ -143,9 +143,8 @@ class OpenStackCinderShell(object): parser.add_argument('--os-auth-system', metavar='<os-auth-system>', dest='os_auth_type', - default=utils.env('OS_AUTH_SYSTEM', - default=utils.env('OS_AUTH_TYPE')), - help=_('DEPRECATED! Use --os-auth-type.' + default=utils.env('OS_AUTH_SYSTEM'), + help=_('DEPRECATED! Use --os-auth-type. ' 'Defaults to env[OS_AUTH_SYSTEM].')) parser.add_argument('--os_auth_system', help=argparse.SUPPRESS) diff --git a/cinderclient/v3/shell.py b/cinderclient/v3/shell.py index e1c6e90..7bc8c29 100644 --- a/cinderclient/v3/shell.py +++ b/cinderclient/v3/shell.py @@ -363,14 +363,14 @@ def do_list(cs, args): "exercise caution when using. Default=None, that means the " "state is unchanged.")) @utils.arg('--attach-status', metavar='<attach-status>', default=None, - help=('This only used in volume entity. The attach status to ' - 'assign to the volume in the DataBase, with no regard to ' - 'the actual status. Valid values are "attached" and ' + help=('This is only used for a volume entity. The attach status ' + 'to assign to the volume in the database, with no regard ' + 'to the actual status. Valid values are "attached" and ' '"detached". Default=None, that means the status ' 'is unchanged.')) @utils.arg('--reset-migration-status', 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 ' 'volume is source or destination of volume migration, ' 'with no regard to the actual status.')) |