summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjichenjc <jichenjc@cn.ibm.com>2016-09-06 20:00:26 +0800
committerRob Cresswell <robert.cresswell@outlook.com>2016-09-21 08:39:48 +0000
commit159e9aa9963529dde43c955554bee9cf8b9fd43b (patch)
tree91b311b9888052b60aeacb151dc8a75a8b3cdd60
parentd9f9df343cba65145d04d3569b6597f76227c57d (diff)
downloaddjango_openstack_auth-159e9aa9963529dde43c955554bee9cf8b9fd43b.tar.gz
Fix wrong warning about keystone version
The variable should be an array but we used string, so it lead to incorrect warning in the httpd log. Change-Id: I7a233338306e51ba11f2d80acfc758700f6bddd2 Closes-Bug: 1621137 (cherry picked from commit cec7a021707972b1434bc1be656c5ff1d1315b55)
-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 "