Changeset 0b799e0

Timestamp:

Mar 7, 2010 8:39:41 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

c2c153b

Parents:

062b991

Message:

stage an ssh identity properly

File:

• fedd/federation/proxy_protogeni_segment.py (modified) (3 diffs)

fedd/federation/proxy_protogeni_segment.py

@@ -329 +329 @@
 
         fed_dir = "/usr/local/federation"
-        ssh = "/usr/bin/ssh -n -o 'ForwardX11 no' -o 'StrictHostKeyChecking no' "
-        scp = "/usr/bin/scp -o 'ForwardX11 no' -o 'StrictHostKeyChecking no' "
+        ssh = "/usr/bin/ssh -n -i .ssh/id_rsa -o 'ForwardX11 no' -o 'StrictHostKeyChecking no' "
+        scp = "/usr/bin/scp -i .ssh/id_rsa -o 'ForwardX11 no' -o 'StrictHostKeyChecking no' "
         ifconfig = "/sbin/ifconfig"
         tar = "/bin/tar"
@@ -403 +403 @@
                 self.log.error("Unmapped node: %s" % vname)
 
-    def start_nodes(self, user, nodes):
+    def start_node(self, user, host, node):
+        # Place an identity on the node so that the copying can succeed
+        self.ssh_cmd(user, host, "scp .ssh/id_rsa %s:.ssh" % node)
+        self.ssh_cmd(user, node, "sudo /bin/sh ./%s.startup &" % node)
+
+    def start_nodes(self, user, host, nodes):
         threads = [ ]
         for n in nodes:
-            t = Thread(target=self.ssh_cmd, args=(user, n,
-                    "sudo /bin/sh ./%s.startup &" % n))
+            t = Thread(target=self.start_node, args=(user, host, n))
             t.start()
             threads.append(t)
@@ -610 +614 @@
                 pubkey, secretkey, stagingdir, tmpdir)
 
-        self.start_nodes(user, [ n['hostname'] for n in nodes.values()])
+        self.start_nodes(user, parent.staging_host, 
+                [ n['hostname'] for n in nodes.values()])
 
         # Everything has gone OK.