Merge "Fix missing service_catalog parameter in Client object"3.8.0

1 files changed, 4 insertions, 1 deletions

diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py
index 9d54769..4d893c3 100644
--- a/keystoneclient/httpclient.py
+++ b/keystoneclient/httpclient.py
@@ -442,7 +442,10 @@ class HTTPClient(baseclient.Client, base.BaseAuthPlugin):
     @property
     def service_catalog(self):
         """Return this client's service catalog."""
-        return self.auth_ref.service_catalog
+        try:
+            return self.auth_ref.service_catalog
+        except AttributeError:
+            return None
 
     def has_service_catalog(self):
         """Return True if this client provides a service catalog."""