diff options
| author | Dolph Mathews <dolph.mathews@gmail.com> | 2012-10-30 00:49:59 +0000 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2012-10-30 00:49:59 +0000 |
| commit | b75c2d6969e7d278a58543b0d687f933b5455b6a (patch) | |
| tree | bc1877b3a2768130f0ef6011e3954ea1b8a433b9 /keystoneclient/shell.py | |
| parent | 16ff6de10a641c68927415a96e3e55217e376e34 (diff) | |
| download | python-keystoneclient-b75c2d6969e7d278a58543b0d687f933b5455b6a.tar.gz | |
Update --os-* error messages
Change-Id: Ic1b3d6baef1fee74cff3bdc92dfe9bccae75a29e
Diffstat (limited to 'keystoneclient/shell.py')
| -rw-r--r-- | keystoneclient/shell.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/keystoneclient/shell.py b/keystoneclient/shell.py index 126e082..5ba42ae 100644 --- a/keystoneclient/shell.py +++ b/keystoneclient/shell.py @@ -272,10 +272,10 @@ class OpenStackIdentityShell(object): # if the user hasn't provided any auth data if not (args.os_token or args.os_endpoint or args.os_username or args.os_password or args.os_auth_url): - raise exc.CommandError('Expecting authentication method via \n' - ' either a service token, ' - '--token or env[SERVICE_TOKEN], \n' - ' or credentials, ' + raise exc.CommandError('Expecting authentication method via' + '\n either a service token, ' + '--os-token or env[OS_SERVICE_TOKEN], ' + '\n or credentials, ' '--os-username or env[OS_USERNAME].') # if it looks like the user wants to provide a service token @@ -284,13 +284,13 @@ class OpenStackIdentityShell(object): args.os_token and args.os_endpoint): if not args.os_token: raise exc.CommandError( - 'Expecting a token provided via either --token or ' - 'env[SERVICE_TOKEN]') + 'Expecting a token provided via either --os-token or ' + 'env[OS_SERVICE_TOKEN]') if not args.os_endpoint: raise exc.CommandError( - 'Expecting an endpoint provided via either --endpoint ' - 'or env[SERVICE_ENDPOINT]') + 'Expecting an endpoint provided via either ' + '--os-endpoint or env[OS_SERVICE_ENDPOINT]') # if it looks like the user wants to provide a credentials # but is missing something |