openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Fix discover command failed to discover keystone in ssl"

Browse Source
This commit is contained in:
Jenkins
2014-01-28 02:38:46 +00:00
committed by Gerrit Code Review
parent 655ce58274 649b9b9431
commit a0ebd5ee6d
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
keystoneclient/generic/client.py
View File

@@ -75,13 +75,15 @@ class Client(httpclient.HTTPClient):
def _local_keystone_exists(self): def _local_keystone_exists(self):
"""Checks if Keystone is available on default local port 35357.""" """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): def _check_keystone_versions(self, url):
"""Calls Keystone URL and detects the available API versions.""" """Calls Keystone URL and detects the available API versions."""
try: try:
client = httpclient.HTTPClient() resp, body = self.request(url, "GET",
resp, body = client.request(url, "GET",
headers={'Accept': headers={'Accept':
'application/json'}) 'application/json'})
# Multiple Choices status code is returned by the root # Multiple Choices status code is returned by the root
@@ -143,10 +145,9 @@ class Client(httpclient.HTTPClient):
def _check_keystone_extensions(self, url): def _check_keystone_extensions(self, url):
"""Calls Keystone URL and detects the available extensions.""" """Calls Keystone URL and detects the available extensions."""
try: try:
client = httpclient.HTTPClient()
if not url.endswith("/"): if not url.endswith("/"):
url += '/' url += '/'
resp, body = client.request("%sextensions" % url, "GET", resp, body = self.request("%sextensions" % url, "GET",
headers={'Accept': headers={'Accept':
'application/json'}) 'application/json'})
if resp.status_code in (200, 204): # some cases we get No Content if resp.status_code in (200, 204): # some cases we get No Content