openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Update --os-* error messages"

Browse Source
This commit is contained in:
Jenkins
2012-11-07 22:54:54 +00:00
committed by Gerrit Code Review
parent 0fddc40e88 b75c2d6969
commit d471f65231
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
keystoneclient/shell.py
View File

@@ -272,10 +272,10 @@ class OpenStackIdentityShell(object):
# if the user hasn't provided any auth data # if the user hasn't provided any auth data
if not (args.os_token or args.os_endpoint or args.os_username or if not (args.os_token or args.os_endpoint or args.os_username or
args.os_password or args.os_auth_url): args.os_password or args.os_auth_url):
raise exc.CommandError('Expecting authentication method via \n' raise exc.CommandError('Expecting authentication method via'
' either a service token, ' '\n either a service token, '
'--token or env[SERVICE_TOKEN], \n' '--os-token or env[OS_SERVICE_TOKEN], '
' or credentials, ' '\n or credentials, '
'--os-username or env[OS_USERNAME].') '--os-username or env[OS_USERNAME].')
# if it looks like the user wants to provide a service token # 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): args.os_token and args.os_endpoint):
if not args.os_token: if not args.os_token:
raise exc.CommandError( raise exc.CommandError(
'Expecting a token provided via either --token or ' 'Expecting a token provided via either --os-token or '
'env[SERVICE_TOKEN]') 'env[OS_SERVICE_TOKEN]')
if not args.os_endpoint: if not args.os_endpoint:
raise exc.CommandError( raise exc.CommandError(
'Expecting an endpoint provided via either --endpoint ' 'Expecting an endpoint provided via either '
'or env[SERVICE_ENDPOINT]') '--os-endpoint or env[OS_SERVICE_ENDPOINT]')
# if it looks like the user wants to provide a credentials # if it looks like the user wants to provide a credentials
# but is missing something # but is missing something