Merge "Do not use service catalog for cache client" into stable/newtonnewton-eol

2 files changed, 11 insertions, 1 deletions

diff --git a/glance/image_cache/client.py b/glance/image_cache/client.py
index 3cf7bfaf6..22160152d 100644
--- a/glance/image_cache/client.py
+++ b/glance/image_cache/client.py
@@ -128,4 +128,5 @@ def get_client(host, port=None, timeout=None, use_ssl=False, username=None,
         auth_token=auth_token or
         os.getenv('OS_TOKEN'),
         creds=creds,
-        insecure=insecure)
+        insecure=insecure,
+        configure_via_auth=False)
diff --git a/glance/tests/unit/test_image_cache_client.py b/glance/tests/unit/test_image_cache_client.py
index 883200c8d..c3ea9db33 100644
--- a/glance/tests/unit/test_image_cache_client.py
+++ b/glance/tests/unit/test_image_cache_client.py
@@ -116,6 +116,15 @@ class GetClientTestCase(utils.BaseTestCase):
         ).creds
         self.assertEqual(expected_creds, creds)
 
+    def test_get_client_using_provided_host(self):
+        cli = client.get_client(self.host)
+        cli._do_request = mock.MagicMock()
+        cli.configure_from_url = mock.MagicMock()
+        cli.auth_plugin.management_url = mock.MagicMock()
+        cli.do_request("GET", "/queued_images")
+        self.assertFalse(cli.configure_from_url.called)
+        self.assertFalse(client.get_client(self.host).configure_via_auth)
+
     def test_get_client_client_configuration_error(self):
         self.assertRaises(exception.ClientConfigurationError,
                           client.get_client, self.host, username='name',