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:
9bd7dd8
)
dont forget to save gid to file before attempting to copy it onto the node. fix the...
author
Tony Mack
<tmack@cs.princeton.edu>
Wed, 9 Dec 2009 21:23:13 +0000
(21:23 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Wed, 9 Dec 2009 21:23:13 +0000
(21:23 +0000)
sfa/methods/get_key.py
patch
|
blob
|
history
diff --git
a/sfa/methods/get_key.py
b/sfa/methods/get_key.py
index
27969b8
..
2a31a91
100644
(file)
--- a/
sfa/methods/get_key.py
+++ b/
sfa/methods/get_key.py
@@
-55,21
+55,21
@@
class get_key(Method):
# attempt the scp the key
# and gid onto the node
# attempt the scp the key
# and gid onto the node
- # this will only work for planetlab based compo
e
nents
+ # this will only work for planetlab based components
(kfd, key_filename) = tempfile.mkstemp()
(gfd, gid_filename) = tempfile.mkstemp()
pkey.save_to_file(key_filename)
(kfd, key_filename) = tempfile.mkstemp()
(gfd, gid_filename) = tempfile.mkstemp()
pkey.save_to_file(key_filename)
- gid_
str = gid.save_to_file(
save_parents=True)
+ gid_
object.save_to_file(gid_filename,
save_parents=True)
host = node['hostname']
key_dest="/etc/sfa/node.key"
gid_dest="/etc/sfa/node.gid"
scp = "/usr/bin/scp"
identity = "/etc/sfa/root_ssh_key"
host = node['hostname']
key_dest="/etc/sfa/node.key"
gid_dest="/etc/sfa/node.gid"
scp = "/usr/bin/scp"
identity = "/etc/sfa/root_ssh_key"
- scp_options=" -i %(identity)s
%(filename)s
" % locals()
+ scp_options=" -i %(identity)s " % locals()
scp_options+="-o StrictHostKeyChecking=no " % locals()
scp_options+="-o StrictHostKeyChecking=no " % locals()
- scp_key_command="%(scp)s %(scp_options)s root@%(host)s:%(key_dest)s" %\
+ scp_key_command="%(scp)s %(scp_options)s
%(key_filename)s
root@%(host)s:%(key_dest)s" %\
locals()
locals()
- scp_gid_command="%(scp)s %(scp_options)s root@%(host)s:%(gid_dest)s" %\
+ scp_gid_command="%(scp)s %(scp_options)s
%(gid_filename)s
root@%(host)s:%(gid_dest)s" %\
locals()
all_commands = [scp_key_command, scp_gid_command]
locals()
all_commands = [scp_key_command, scp_gid_command]