diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-01-27 07:16:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-01-27 07:16:09 +0000 |
| commit | dd92af2a9eafa132dd4ce254221180455e8a7349 (patch) | |
| tree | ba4424af12e4ec74baee1d2883ec40af2fa5d9e7 | |
| parent | 17d7455d27ce2f98a99b106696a37270931d3de8 (diff) | |
| parent | fbee97cf196fa4517c753f2daadb3606d3b5dca3 (diff) | |
| download | python-cinderclient-dd92af2a9eafa132dd4ce254221180455e8a7349.tar.gz | |
Merge "Remove RAX-specific auth in cinderclient"
| -rw-r--r-- | cinderclient/client.py | 16 | ||||
| -rw-r--r-- | doc/source/index.rst | 1 |
2 files changed, 2 insertions, 15 deletions
diff --git a/cinderclient/client.py b/cinderclient/client.py index a9f11f1..c268137 100644 --- a/cinderclient/client.py +++ b/cinderclient/client.py @@ -22,7 +22,6 @@ OpenStack Client interface. Handles the REST calls and responses. from __future__ import print_function import logging -import os try: import urlparse @@ -296,10 +295,7 @@ class HTTPClient(object): auth_url = self.auth_url if self.version == "v2.0": while auth_url: - if "CINDER_RAX_AUTH" in os.environ: - auth_url = self._rax_auth(auth_url) - else: - auth_url = self._v2_auth(auth_url) + auth_url = self._v2_auth(auth_url) # Are we acting on behalf of another user via an # existing token? If so, our actual endpoints may @@ -358,16 +354,6 @@ class HTTPClient(object): self._authenticate(url, body) - def _rax_auth(self, url): - """Authenticate against the Rackspace auth service.""" - body = {"auth": { - "RAX-KSKEY:apiKeyCredentials": { - "username": self.user, - "apiKey": self.password, - "tenantName": self.projectid}}} - - self._authenticate(url, body) - def _authenticate(self, url, body): """Authenticate and extract the service catalog.""" token_url = url + "/tokens" diff --git a/doc/source/index.rst b/doc/source/index.rst index e7ca6fd..6c4df22 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -34,6 +34,7 @@ MASTER * Add support for reset-state on multiple volumes or snapshots at once * Add volume retype command +.. _966329: https://bugs.launchpad.net/python-cinderclient/+bug/966329 .. _1265893: https://bugs.launchpad.net/python-cinderclient/+bug/1265893 .. _1256043: https://bugs.launchpad.net/python-cinderclient/+bug/1256043 .. _1254951: http://bugs.launchpad.net/python-cinderclient/+bug/1254951 |