From 9a626589a8082a002a02530a3f480088c9dc4fa9 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 15 Aug 2015 15:58:28 +0700
Subject: [PATCH] Move keystone to common identity client interface

It's weird that keystone is different from the other things. But let's
just let that be life.

Change-Id: I3891454b2706db2553e52f1ca3932285260f08bc
---
 shade/__init__.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/shade/__init__.py b/shade/__init__.py
index 5c03b0979..c8460cecf 100644
--- a/shade/__init__.py
+++ b/shade/__init__.py
@@ -394,14 +394,8 @@ class OpenStackCloud(object):
     @property
     def keystone_client(self):
         if self._keystone_client is None:
-            try:
-                self._keystone_client = self._get_identity_client_class()(
-                    session=self.keystone_session)
-            except Exception as e:
-                self.log.debug(
-                    "Couldn't construct keystone object", exc_info=True)
-                raise OpenStackCloudException(
-                    "Error constructing keystone client: %s" % str(e))
+            self._keystone_client = self._get_client(
+                'identity', self._get_identity_client_class())
         return self._keystone_client
 
     @property