Changeset 86a7bb8

Timestamp:

Mar 12, 2010 1:01:00 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

35a4c01

Parents:

4e9719b

Message:

Use the more general fedkit routing setup and make sure that installed tarballs have a place to go.

File:

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

fedd/federation/proxy_protogeni_segment.py

@@ -334 +334 @@
         ifconfig = "/sbin/ifconfig"
         tar = "/bin/tar"
+        mkdir="/bin/mkdir"
 
         for e in [ e for e in topo.elements if isinstance(e, topdl.Computer)]:
@@ -359 +360 @@
                     print >>script, "%s %s@%s:%s/%s ." % \
                             (scp, user, host, stagingdir, base)
+                    # Make sure that there's a directory there in which to
+                    # untar.
+                    print >>script, "%s -p %s" % (mkdir, l)
                     print >>script, \
                             "%s -C %s -xzf %s" % (tar, l, base)
@@ -369 +373 @@
                     print >>script, "%s %s@%s:%s/%s ." % \
                             (scp, user, host, stagingdir, s_base)
+                    # Make sure that there's a directory there in which to
+                    # untar.
+                    print >>script, "%s -p %s" % (mkdir, s.install)
                     print >>script, \
                             "%s -C %s -xzf %s" % (tar, s.install, s_base)
@@ -414 +421 @@
                     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
-                    # start routing on nodes
-                    print >>script, "sudo perl %s/bin/protogeni_routing.pl" % \
-                            fed_dir
                     if e.get_attribute('startup'):
                         print >>script, "%s \\$USER '%s'" % \