summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <juan.osorio.robles@ericsson.com>2015-06-25 11:44:13 +0300
committerJuan Antonio Osorio Robles <juan.osorio.robles@ericsson.com>2015-06-25 11:46:13 +0300
commit8cebffdffb9b85003972b1bdd611ace203c2a657 (patch)
treeb0fb921badd49b667825417ee3401106aa903b9e
parent42a3c4b0d94758606a0cab1367fb831b3d97c063 (diff)
downloadpython-barbicanclient-8cebffdffb9b85003972b1bdd611ace203c2a657.tar.gz
Use keystone discovery instead of endpoint_override
Since the version information is now provided by the barbican server, there is no need for using an endpoint_override for the client as used to be the case. Now we can rely on keystone to fill this information for us. Change-Id: Ia9adb8a0729c26452162eca4f9aa43d3a5c7591b
-rw-r--r--barbicanclient/client.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/barbicanclient/client.py b/barbicanclient/client.py
index 7f0a6b2..6e0a47e 100644
--- a/barbicanclient/client.py
+++ b/barbicanclient/client.py
@@ -43,13 +43,8 @@ class _HTTPClient(adapter.Adapter):
super(_HTTPClient, self).__init__(session, **kwargs)
- if not endpoint:
- endpoint = self.get_endpoint()
- # NOTE(jaosorior): We are manually appending the given version. This
- # could be filled automatically by keystoneclient; but
- # we need the fix-version-api blueprint to land in the
- # server first.
- self.endpoint_override = '{0}/{1}'.format(endpoint, self.version)
+ if endpoint:
+ self.endpoint_override = '{0}/{1}'.format(endpoint, self.version)
if project_id is None:
self._default_headers = dict()