Author: tomaz
Date: Thu Dec 15 07:51:46 2011
New Revision: 1214646

URL: http://svn.apache.org/viewvc?rev=1214646&view=rev
Log:
Fix a bug in OpenStack driver when 2.0_apikey or 2.0_password
'auth_version' is used. Reported by Shawn Smith.

Modified:
    libcloud/trunk/CHANGES
    libcloud/trunk/libcloud/common/openstack.py

Modified: libcloud/trunk/CHANGES
URL: 
http://svn.apache.org/viewvc/libcloud/trunk/CHANGES?rev=1214646&r1=1214645&r2=1214646&view=diff
==============================================================================
--- libcloud/trunk/CHANGES (original)
+++ libcloud/trunk/CHANGES Thu Dec 15 07:51:46 2011
@@ -15,6 +15,10 @@ Changes with Apache Libcloud in developm
      - Add support for Amazon new South America (Sao Paulo) location.
        [Tomaz Muraus]
 
+     - Fix a bug in OpenStack driver when 2.0_apikey or 2.0_password
+       'auth_version' is used.
+       [Tomaz Muraus]
+
   *) Storage:
 
     - Propagate extra keyword arguments passed to the Rackspace driver

Modified: libcloud/trunk/libcloud/common/openstack.py
URL: 
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/common/openstack.py?rev=1214646&r1=1214645&r2=1214646&view=diff
==============================================================================
--- libcloud/trunk/libcloud/common/openstack.py (original)
+++ libcloud/trunk/libcloud/common/openstack.py Thu Dec 15 07:51:46 2011
@@ -289,7 +289,7 @@ class OpenStackBaseConnection(Connection
             self.auth_token = osa.auth_token
 
             # TODO: Multi-region support
-            if self._auth_version == '2.0':
+            if self._auth_version in ['2.0', '2.0_apikey', '2.0_password']:
                 self.tenant_ids = {}
 
                 for service in osa.urls:


Reply via email to