From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 16 Mar 2012 03:54:29 +0000 (-0400)
Subject: fix access_key
X-Git-Tag: sfa-2.1-4~23
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=04cdf5af60dff0dcc75b4f86897f812538105cc6;p=sfa.git

fix access_key
---

diff --git a/sfa/openstack/euca_shell.py b/sfa/openstack/euca_shell.py
index 616057fd..dfeee5a5 100644
--- a/sfa/openstack/euca_shell.py
+++ b/sfa/openstack/euca_shell.py
@@ -24,7 +24,8 @@ class EucaShell:
             return None
         nova = NovaShell(self.config)
         admin_user = nova.auth_manager.get_user(self.config.SFA_NOVA_USER)
-        access_key = admin_user.access
+        #access_key = admin_user.access
+        access_key = '%s' % admin_user.name
         secret_key = admin_user.secret
         url = self.config.SFA_NOVA_API_URL
         host = None
@@ -44,8 +45,7 @@ class EucaShell:
             parts = parts[1].split('/')
             port = int(parts[0])
             parts = parts[1:]
-            path = '/'.join(parts)
-
+            path = '/'+'/'.join(parts)
         return boto.connect_ec2(aws_access_key_id=access_key,
                                 aws_secret_access_key=secret_key,
                                 is_secure=use_ssl,
@@ -57,5 +57,4 @@ class EucaShell:
     def __getattr__(self, name):
         def func(*args, **kwds):
             conn = self.get_euca_connection()
-            return getattr(conn, name)(*args, **kwds)
-        return func                     
+