From dd56c4e8bdb646338a7f66c32233002c3f5228be Mon Sep 17 00:00:00 2001 From: Timur Sufiev Date: Fri, 27 May 2016 12:40:55 +0300 Subject: [PATCH] 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 --- openstack_auth/utils.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openstack_auth/utils.py b/openstack_auth/utils.py index ebe2c597..22939086 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