From 37112f92d8a79f692c955e8cce8b6d045c98254a Mon Sep 17 00:00:00 2001 From: Dave Chen <wei.d.chen@intel.com> Date: Sun, 14 Jun 2015 21:15:58 +0800 Subject: [PATCH] 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 --- openstackclient/api/auth.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openstackclient/api/auth.py b/openstackclient/api/auth.py index 1d50f92..820b4ec 100644 --- a/openstackclient/api/auth.py +++ b/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('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')