Improve the hint message

Currently, we can get scoped token (domain scoped, project scoped)
as well as unscoped token.

When we use OSC to get a domain scoped token without explicitly set
domain information, the hint message show us we need to set a scoped
domain or project, but it miss that the parameters to be set in order
to get project or domain scoped token is not the same.

Thus, the hint message could be improved to make it more clear to
end user.

Change-Id: I94768c619b30be18737fec189ae6d81e81ba090d
This commit is contained in:
Dave Chen 2015-06-14 21:15:58 +08:00 committed by Dave Chen
parent aac0d588bd
commit 9f69b43f5a

View File

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