diff options
| author | Timur Sufiev <tsufiev@mirantis.com> | 2016-05-27 12:40:55 +0300 |
|---|---|---|
| committer | Timur Sufiev <tsufiev@mirantis.com> | 2016-05-27 09:57:15 +0000 |
| commit | dd56c4e8bdb646338a7f66c32233002c3f5228be (patch) | |
| tree | 6efc59d8b5a3e86582647dbc8b87eca2fc7e3345 | |
| parent | 405cb08207cf87145975d534634165caa701c92b (diff) | |
| download | django_openstack_auth-2.3.0.tar.gz | |
Clarify the confusing warning in case of Keystone v2.0 vs v3 conflict2.3.0
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
| -rw-r--r-- | openstack_auth/utils.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/openstack_auth/utils.py b/openstack_auth/utils.py index ebe2c59..2293908 100644 --- a/openstack_auth/utils.py +++ b/openstack_auth/utils.py @@ -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 |