fix access_key
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Fri, 16 Mar 2012 03:54:29 +0000 (23:54 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Fri, 16 Mar 2012 03:54:29 +0000 (23:54 -0400)
sfa/openstack/euca_shell.py

index 616057f..dfeee5a 100644 (file)
@@ -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                     
+