summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-22 05:46:01 +0000
committerGerrit Code Review <review@openstack.org>2016-09-22 05:46:01 +0000
commitd51a0bdfd9f8c380d602753428dea6955eed1f72 (patch)
tree59ab09c0d29261d419cff7069717c08c5b013179
parent1be29e4b586092dcae46e27e244236cf430cb159 (diff)
parent159e9aa9963529dde43c955554bee9cf8b9fd43b (diff)
downloaddjango_openstack_auth-d51a0bdfd9f8c380d602753428dea6955eed1f72.tar.gz
Merge "Fix wrong warning about keystone version" into stable/newton
-rw-r--r--openstack_auth/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack_auth/utils.py b/openstack_auth/utils.py
index eca6389..44b3931 100644
--- a/openstack_auth/utils.py
+++ b/openstack_auth/utils.py
@@ -294,7 +294,7 @@ def fix_auth_url_version(auth_url):
"""
auth_url = _augment_url_with_version(auth_url)
- if get_keystone_version() >= 3 and has_in_url_path(auth_url, "/v2.0"):
+ if get_keystone_version() >= 3 and has_in_url_path(auth_url, ["/v2.0"]):
LOG.warning("The Keystone URL (either in Horizon settings or in "
"service catalog) points to a v2.0 Keystone endpoint, "
"but v3 is specified as the API version to use by "