diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-02 02:15:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-02 02:15:52 +0000 |
| commit | 9bf24f3ae1f8bbf0003206d2e158b597bffe787f (patch) | |
| tree | 87dcb4687c089b40fc0d5b6a1a54c69c6515c81a /openstackclient/api | |
| parent | 4d57e9f62a6d49fb7114ea718dda166f349d9341 (diff) | |
| parent | 3ae247fdceac0e2c7bb6160f9ffefc4ad5d8da29 (diff) | |
| download | python-openstackclient-9bf24f3ae1f8bbf0003206d2e158b597bffe787f.tar.gz | |
Merge "Set tenant options on parsed namespace"
Diffstat (limited to 'openstackclient/api')
| -rw-r--r-- | openstackclient/api/auth.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openstackclient/api/auth.py b/openstackclient/api/auth.py index 9fb26e71..1d50f92c 100644 --- a/openstackclient/api/auth.py +++ b/openstackclient/api/auth.py @@ -149,7 +149,9 @@ def check_valid_auth_options(options, auth_plugin_name): if (not options.auth.get('project_id', None) and not options.auth.get('domain_id', None) and not options.auth.get('domain_name', None) and not - options.auth.get('project_name', None)): + 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') elif auth_plugin_name.endswith('token'): |