Changeset 8e6fe4d for fedd/federation/proxy_protogeni_segment.py

Timestamp:

Mar 5, 2010 4:58:48 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

c5b28bf

Parents:

444790d

Message:

checkpoint and SLSL error catching

File:

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

fedd/federation/proxy_protogeni_segment.py

@@ -80 +80 @@
     # interfaces in 'interfaces'.  I love having XML parser code lying around.
     def manifest_to_dict(self, manifest):
-        # XXX
-        # if self.debug: return { }
+        if self.debug: return { }
 
         # The class allows us to keep a little state - the dict under
@@ -202 +201 @@
                     print >>script, \
                             "%s -C %s -xzf %s" % (tar, s.install, s_base)
-                for f in ('hosts', pubkey, secretkey):
+                for f in ('hosts', pubkey, secretkey, 'client.conf', 
+                        'userconf', 'seer.conf'):
                     print >>script, "%s %s@%s:%s/%s %s/etc" % \
                             (scp, user, host, stagingdir, f, fed_dir)
@@ -215 +215 @@
                             (scp, user, host, stagingdir, vname, fed_dir)
 
+
                 # Start commands
                 if e.get_attribute('portal') and gate_cmd:
@@ -220 +221 @@
                     print >>script, gate_cmd
                 elif node_cmd:
+                    # XXX: debug
+                    print >>script, "sudo perl -I%s/lib %s/bin/import_key.pl /users/%s/.ssh/authorized_keys /root/.ssh/authorized_keys" % (fed_dir, fed_dir, user)
+                    # XXX: debug
                     if e.get_attribute('startup'):
                         print >>script, "%s \\$USER '%s'" % \