Merge "Catching overcloud keystone exception"

1 files changed, 8 insertions, 4 deletions

diff --git a/tuskar_ui/api.py b/tuskar_ui/api.py
index 2b809733..11dcfbb1 100644
--- a/tuskar_ui/api.py
+++ b/tuskar_ui/api.py
@@ -11,6 +11,7 @@
 #    under the License.
 import django.conf
 import heatclient
+import keystoneclient
 import logging
 import urlparse
 
@@ -227,10 +228,13 @@ class Overcloud(base.APIResourceWrapper):
                 break
         else:
             return None
-
-        return overcloud_keystoneclient(self._request,
-                                        output['output_value'],
-                                        self.attributes['AdminPassword'])
+        try:
+            return overcloud_keystoneclient(self._request,
+                                            output['output_value'],
+                                            self.attributes['AdminPassword'])
+        except keystoneclient.apiclient.exceptions.Unauthorized:
+            LOG.debug('Unable to connect overcloud keystone.')
+            return None
 
     @classmethod
     def create(cls, request, overcloud_sizing, overcloud_configuration):