openstack
/
django_openstack_auth
Code Issues Proposed changes

Clarify the confusing warning in case of Keystone v2.0 vs v3 conflict 

Since the function emitting the warning now can be used both for
processing of Keystone URL from Horizon settings and for fixing
URLs from service catalog, the old warning messages becomes confusing.
The patch makes things clear again.

Change-Id: Id70b50e01fc9c3d59d5e41684759b5c8bd8abee9
This commit is contained in:
Timur Sufiev 2016-05-27 12:40:55 +03:00
parent 405cb08207
commit dd56c4e8bd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_auth/utils.py
View File

@ -281,9 +281,10 @@ def fix_auth_url_version(auth_url):
if get_keystone_version() >= 3:
if has_in_url_path(auth_url, "/v2.0"):
LOG.warning("The settings.py file points to a v2.0 keystone "
"endpoint, but v3 is specified as the API version "
"to use. Using v3 endpoint for authentication.")
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 "
"Horizon. Using v3 endpoint for authentication.")
auth_url = url_path_replace(auth_url, "/v2.0", "/v3", 1)
return auth_url