commit 6de49c98ba8534cf4a1b03bd0a251f578403d1ed
author Oleh Hryhorov <ohryhorov@mirantis.com> Mon May 21 12:53:59 2018 +0000
committer Oleh Hryhorov <ohryhorov@mirantis.com> Wed May 23 14:07:44 2018 +0000
tree 829d85c282d6c5118c1736f6b89a6d3a7645dab5
parent 6d4cdcedb55de425bbe2e05f9578a911d5fa3e41

Adjusting and refactoring salt-formula for Queens

Change-Id: Ib6647f9a4967b5f2ba4fbfaec2e6f6d00622a671

_modules/glancev2/common.py

diff --git a/_modules/glancev2/common.py b/_modules/glancev2/common.py
index 1e686f1..79d93a0 100644
--- a/_modules/glancev2/common.py
+++ b/_modules/glancev2/common.py
@@ -44,12 +44,15 @@
 
 def get_raw_client(cloud_name):
     service_type = 'image'
-    adapter = os_client_config.make_rest_client(service_type,
-                                                cloud=cloud_name)
+    config = os_client_config.OpenStackConfig()
+    cloud = config.get_one_cloud(cloud_name)
+    adapter = cloud.get_session_client(service_type)
+    adapter.version = '2'
     try:
         access_info = adapter.session.auth.get_access(adapter.session)
         endpoints = access_info.service_catalog.get_endpoints()
-    except (AttributeError, ValueError):
+    except (AttributeError, ValueError) as exc:
+        log.exception('%s' % exc)
         e = NoAuthPluginConfigured()
         log.exception('%s' % e)
         raise e