git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8e5f316
)
added pubkeys_to_user_data()
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 22 Jun 2012 17:27:54 +0000
(13:27 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 22 Jun 2012 17:27:54 +0000
(13:27 -0400)
sfa/openstack/osaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/osaggregate.py
b/sfa/openstack/osaggregate.py
index
90fd003
..
eceaf3c
100644
(file)
--- a/
sfa/openstack/osaggregate.py
+++ b/
sfa/openstack/osaggregate.py
@@
-24,6
+24,14
@@
from sfa.openstack.image import ImageManager
from sfa.openstack.security_group import SecurityGroup
from sfa.util.sfalogging import logger
from sfa.openstack.security_group import SecurityGroup
from sfa.util.sfalogging import logger
+def pubkeys_to_user_data(pubkeys):
+ user_data = "#!/bin/bash\n\n"
+ for pubkey in pubkeys:
+ pubkey = pubkey.replace('\n', '')
+ user_data += " echo %s >> /root/.ssh/authorized_keys" % pubkey
+ user_data += "echo >> /root/.ssh/authorized_keys"
+ return user_data
+
def instance_to_sliver(instance, slice_xrn=None):
# should include?
# * instance.image_ref
def instance_to_sliver(instance, slice_xrn=None):
# should include?
# * instance.image_ref
@@
-292,7
+300,7
@@
class OSAggregate:
# get requested slivers
rspec = RSpec(rspec)
# get requested slivers
rspec = RSpec(rspec)
- user_data =
"\n".join
(pubkeys)
+ user_data =
pubkeys_to_user_data
(pubkeys)
requested_instances = defaultdict(list)
# iterate over clouds/zones/nodes
for node in rspec.version.get_nodes_with_slivers():
requested_instances = defaultdict(list)
# iterate over clouds/zones/nodes
for node in rspec.version.get_nodes_with_slivers():