Merge "Remove RAX-specific auth in cinderclient"

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"

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