openstack/python-openstackclient
Code Issues Proposed changes

Merge "Improve the hint message"

Browse Source
This commit is contained in:
Jenkins 2015-06-14 18:41:33 +00:00 committed by Gerrit Code Review
commit ba79c3fdfb
1 changed files with 4 additions and 2 deletions

6
openstackclient/api/auth.py

@ -152,8 +152,10 @@ def check_valid_auth_options(options, auth_plugin_name):
options.auth.get('project_name', None) and not options.auth.get('project_name', None) and not
options.auth.get('tenant_id', None) and not options.auth.get('tenant_id', None) and not
options.auth.get('tenant_name', None)): options.auth.get('tenant_name', None)):
msg += _('Set a scope, such as a project or domain, with ' msg += _('Set a scope, such as a project or domain, set a '
'--os-project-name, OS_PROJECT_NAME or auth.project_name') 'project scope with --os-project-name, OS_PROJECT_NAME '
'or auth.project_name, set a domain scope with '
'--os-domain-name, OS_DOMAIN_NAME or auth.domain_name')
elif auth_plugin_name.endswith('token'): elif auth_plugin_name.endswith('token'):
if not options.auth.get('token', None): if not options.auth.get('token', None):
msg += _('Set a token with --os-token, OS_TOKEN or auth.token\n') msg += _('Set a token with --os-token, OS_TOKEN or auth.token\n')