Fix discover command failed to discover keystone in ssl

Fix the blocking behavior of keystone discover when trying
to obtain information of the local keystone. It does not
block while checking and checks both protocols HTTP and HTTPS

Change-Id: I43616a348bf04163bf7967a12957556d7edfde40
Closes-Bug: #1270154

1 files changed, 10 insertions, 9 deletions

diff --git a/keystoneclient/generic/client.py b/keystoneclient/generic/client.py
index 79cbbc5..58bc52d 100644
--- a/keystoneclient/generic/client.py
+++ b/keystoneclient/generic/client.py
@@ -75,15 +75,17 @@ class Client(httpclient.HTTPClient):
 
     def _local_keystone_exists(self):
         """Checks if Keystone is available on default local port 35357."""
-        return self._check_keystone_versions("http://localhost:35357")
+        results = self._check_keystone_versions("http://localhost:35357")
+        if results is None:
+            results = self._check_keystone_versions("https://localhost:35357")
+        return results
 
     def _check_keystone_versions(self, url):
         """Calls Keystone URL and detects the available API versions."""
         try:
-            client = httpclient.HTTPClient()
-            resp, body = client.request(url, "GET",
-                                        headers={'Accept':
-                                                 'application/json'})
+            resp, body = self.request(url, "GET",
+                                      headers={'Accept':
+                                               'application/json'})
             # Multiple Choices status code is returned by the root
             # identity endpoint, with references to one or more
             # Identity API versions -- v3 spec
@@ -143,12 +145,11 @@ class Client(httpclient.HTTPClient):
     def _check_keystone_extensions(self, url):
         """Calls Keystone URL and detects the available extensions."""
         try:
-            client = httpclient.HTTPClient()
             if not url.endswith("/"):
                 url += '/'
-            resp, body = client.request("%sextensions" % url, "GET",
-                                        headers={'Accept':
-                                                 'application/json'})
+            resp, body = self.request("%sextensions" % url, "GET",
+                                      headers={'Accept':
+                                               'application/json'})
             if resp.status_code in (200, 204):  # some cases we get No Content
                 try:
                     results = {}