From: Andrew Plunk <andrew.plunk@rackspace.com>
Date: Thu, 25 Jul 2013 19:04:06 +0000 (-0500)
Subject: Remove password auth from pyrax
X-Git-Tag: 2014.1~297^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2dba51717a096313ae7b4be770a4301d7770fad0;p=openstack-build%2Fheat-build.git

Remove password auth from pyrax

Remove password auth from pyrax to conform with
the changes going through the engine regarding
not using a password.

blueprint pyrax-token-auth
Change-Id: I4ecc43d138f7cd71d41a7a3cd8ee29a821065383
---

diff --git a/heat/engine/resources/rackspace/rackspace_resource.py b/heat/engine/resources/rackspace/rackspace_resource.py
index 0b98a228..bc2e66d4 100644
--- a/heat/engine/resources/rackspace/rackspace_resource.py
+++ b/heat/engine/resources/rackspace/rackspace_resource.py
@@ -100,8 +100,9 @@ class RackspaceResource(resource.Resource):
             pyrax.set_setting("tenant_id", self.context.tenant)
             logger.info("Authenticating with username:%s" %
                         self.context.username)
-            pyrax.set_credentials(self.context.username,
-                                  password=self.context.password)
+            pyrax.auth_with_token(self.context.token,
+                                  tenant_id=self.context.tenant_id,
+                                  tenant_name=self.context.tenant)
             logger.info("User %s authenticated successfully."
                         % self.context.username)
             self._authenticated = True