commit 976d774450582012e12ced4be760d9a1fbe2689f
author Tony Mack <tmack@paris.CS.Princeton.EDU> Tue Mar 18 22:00:52 2014 -0400
committer Tony Mack <tmack@paris.CS.Princeton.EDU> Tue Mar 18 22:00:52 2014 -0400
tree 785bfe310f29fa2079dc134b6a443ed714c650c3
parent e5968eb455b698c75b600e258506f2dac0f03ec6

fix bugs

planetstack/openstack/client.py

diff --git a/planetstack/openstack/client.py b/planetstack/openstack/client.py
index c6b6b16..16f6b2e 100644
--- a/planetstack/openstack/client.py
+++ b/planetstack/openstack/client.py
@@ -70,8 +70,8 @@
         if endpoint:
             self.endpoint = endpoint
 
-        if '@' in self.username:
-            self.username = self.username[:self.username.index('@')]
+        #if '@' in self.username:
+        #    self.username = self.username[:self.username.index('@')]
 
 class KeystoneDB:
     @require_enabled

planetstack/openstack/driver.py

diff --git a/planetstack/openstack/driver.py b/planetstack/openstack/driver.py
index 174cf85..619a8ed 100644
--- a/planetstack/openstack/driver.py
+++ b/planetstack/openstack/driver.py
@@ -397,7 +397,6 @@
         files = {}
         if pubkeys:
             files['/root/.ssh/authorized_keys'] = "\n".join(pubkeys)
-
         hints = {}
         availability_zone = None
         if hostname: