summaryrefslogtreecommitdiff
path: root/glanceclient/shell.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-01-04 10:40:07 +0000
committerGerrit Code Review <review@openstack.org>2015-01-04 10:40:07 +0000
commit7ce1ff9325be702384d728ad6a94f597680e1707 (patch)
tree51444a606993f9c661414f192c8f9c5daf69ebf5 /glanceclient/shell.py
parente3600ad7beb7cb4a067038d750e530a64fd1e93a (diff)
parentbd73a5482ca8174b6ac83b26ae09cac0e82a468e (diff)
downloadpython-glanceclient-7ce1ff9325be702384d728ad6a94f597680e1707.tar.gz
Merge "Add os_ prefix to project_domain_name/id"
Diffstat (limited to 'glanceclient/shell.py')
-rw-r--r--glanceclient/shell.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/glanceclient/shell.py b/glanceclient/shell.py
index 31891e6..4eb174e 100644
--- a/glanceclient/shell.py
+++ b/glanceclient/shell.py
@@ -480,12 +480,12 @@ class OpenStackImagesShell(object):
project_info = (args.os_tenant_name or
args.os_tenant_id or
(args.os_project_name and
- (args.project_domain_name or
- args.project_domain_id)) or
+ (args.os_project_domain_name or
+ args.os_project_domain_id)) or
args.os_project_id)
if (not project_info):
- # tenent is deprecated in Keystone v3. Use the latest
+ # tenant is deprecated in Keystone v3. Use the latest
# terminology instead.
raise exc.CommandError(
_("You must provide a project_id or project_name ("