summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2017-10-31 13:14:50 +0800
committerBin Yang <bin.yang@windriver.com>2017-10-31 13:14:50 +0800
commita82078106731ac4a627577147057c651ca8073b0 (patch)
tree9183d5a6faf32d67fc4dced53329f646173bde33
parenta9150114496bcf6def3f7f6a5348b2f247b8df4c (diff)
Workaround for keystone url without version
Append v3 to end of keystone url if version is missing Change-Id: Ic0d2ad254b4cf542b5040fed189ad85fe5176e84 Issue-Id: MULTICLOUD-123 Signed-off-by: Bin Yang <bin.yang@windriver.com>
-rw-r--r--newton/newton/requests/views/util.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/newton/newton/requests/views/util.py b/newton/newton/requests/views/util.py
index 59eed5ab..ba383475 100644
--- a/newton/newton/requests/views/util.py
+++ b/newton/newton/requests/views/util.py
@@ -68,7 +68,8 @@ class VimDriverUtils(object):
password=vim["password"],
user_domain_name=vim["domain"],
project_id=tenantid)
- elif '/identity' in vim["url"]:
+ #elif '/identity' in vim["url"]:
+ else:
auth = keystone_v3.Password(auth_url=vim["url"]+"/v3",
username=vim["userName"],
password=vim["password"],
@@ -87,7 +88,8 @@ class VimDriverUtils(object):
project_name=tenant_name,
user_domain_name=vim["domain"],
project_domain_name=vim["domain"])
- elif '/identity' in vim["url"]:
+ #elif '/identity' in vim["url"]:
+ else:
auth = keystone_v3.Password(auth_url=vim["url"]+"/v3",
username=vim["userName"],
password=vim["password"],