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

19
keystoneclient/generic/client.py
View File

@@ -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 = {}