Changeset 9b3627e2bc4bf66eafb212abd8218420b86c0d95 for fedkit

Timestamp:

03/09/10 01:08:05 (2 years ago)

Author:

Ted Faber <faber@…>

Children:

4e9719bb94eafda2b19c6adf8549c315a68a2b15

Parents:

c2c153b2a39dce4ebd1c300fd45dddae2478cea8

git-committer:

Ted Faber <faber@isi.edu> / 2010-03-09T09:08:05Z+0000

Message:

SEER support

Location:

fedkit

Files:

• Makefile (modified) (1 diff)
• combo.pl (modified) (3 diffs)
• federate.pl (modified) (1 diff)
• gateway_lib.pm (modified) (2 diffs)
• prep_gateway.pl (modified) (1 diff)
• smbmount.Linux.pl (modified) (3 diffs)
• start_seer.pl (added)

fedkit/Makefile

@@ -3 +3 @@
          config_from_tunnelip.pl active_config.pl combo.pl \
          prep_gateway.pl port_forward.pl setup_bridge.pl import_key.pl \
-         protogeni_routing.pl
+         protogeni_routing.pl start_seer.pl
 
 LIBRARIES=gateway_lib.pm 

fedkit/combo.pl

@@ -18 +18 @@
 my $iface_file = "/var/emulab/boot/ifmap";
 my $ssh = "/usr/bin/ssh";
+my $seer;
 my $ssh_port = 22;
 my @ports;
@@ -35 +36 @@
     'ssh_port=s' => \$ssh_port,
     'use_file' => \$use_file,
+    'seer' => \$seer,
 );
 
@@ -61 +63 @@
         "--ssh=$ssh --ssh_port=$ssh_port $portparam");
     exit(20) if $?;
+
+    if ($seer ) {
+        system("$perl -I$fedkit_dir/lib $fedkit_dir/bin/start_seer.pl " .
+            "--peer=$peer --seer --fedkit=$fedkit_dir --perl=$perl " .
+            "--ssh=$ssh --ssh_privkey=$ssh_privkey");
+        exit(20) if $?;
+    }
+
 }
 else {

fedkit/federate.pl

@@ -58 +58 @@
     $from->close();
     $to->close();
-    # Now, samba
-    system('/usr/bin/yum -y install samba-client');
+    # Now, samba.  Because of the python dance on PG, we need to call python2.2
+    # explicitly
+    system('/usr/bin/python2.2 /usr/bin/yum -y install samba-client');
     # These tools expect the fstab to include smbfs instead
     $smb_type = 'smbfs';

fedkit/gateway_lib.pm

@@ -367 +367 @@
 
 
+sub client_conf_filename {
+    # Find the configuration file in the usual places, if there is one in
+    # /usr/local/federation/etc, use it, otherwise look in the emulab standard
+    # filesystems which depends on what experiment and project we're in.
+    my $pid;
+    my $eid;
+    my $filename;
+    my $fed_dir = "/usr/local/federation/etc/";
+
+    return "$fed_dir/client.conf" if -r "$fed_dir/client.conf";
+
+    my $tmcd = new IO::Pipe() || die "Can't create pipe: $!\n";
+
+    $tmcd->reader("$TMCC status");
+
+    while (<$tmcd>) {
+        chomp;
+        /ALLOCATED=([^\/]+)\/(\S+)/ && do {
+            $pid = $1;
+            $eid = $2;
+        };
+    }
+    $tmcd->close();
+    $filename = "/proj/$pid/exp/$eid/tmp/client.conf"
+        if $pid and $eid;
+
+    return $filename;
+}
+
 sub wait_for_port {
     my($addr, $port, $timeout, $sleep) = @_;
@@ -376 +405 @@
 
     while (!$s) {
+        # We've seen some arp pollution, so be proactive about clearing the
+        # cache if we're waiting to get out.
+        system("arp -d -a");
         if (!($s = new IO::Socket(Domain => &AF_INET, PeerAddr => $addr, 
             PeerPort => $port))) {

fedkit/prep_gateway.pl

@@ -49 +49 @@
     $from->close();
     $to->close();
-    # Now, bridging
-    system('/usr/bin/yum -y install bridge-utils');
+    # Now, bridging (use old python...)
+    system('/usr/bin/python2.2 /usr/bin/yum -y install bridge-utils');
     #and keys
     gateway_lib::import_key($ssh_pubkey,'/root/.ssh/authorized_keys')

fedkit/smbmount.Linux.pl

@@ -59 +59 @@
         /GID=(\S+)/ && do { $gid = $1; };
         /HOMEDIR=(\S+)/ && do { $homedir = $1; };
+        my $ids = $FSTYPE == 'smbfs' ? ",uid=$uid,gid=$gid" : "";
 
         open(PWDFILE, ">/tmp/$user.cifs_creds") || 
@@ -70 +71 @@
         print FSTAB "//$SHARE/$user\t";
         print FSTAB "$homedir\t$FSTYPE\t";
-        print FSTAB "auto,rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n";
+        print FSTAB "auto,rw,credentials=/tmp/$user.cifs_creds$ids,ip=$ADDR\t0\t0\n";
 
         #
@@ -83 +84 @@
         if($user =~ m/$PUSER/i) {
             print FSTAB "//$SHARE/proj-$PNAME\t";
-            print FSTAB "$PROJROOT/$PNAME\tcifs\t";
-            print FSTAB "rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n";
+            print FSTAB "$PROJROOT/$PNAME\t$FSTYPE\t";
+            print FSTAB "rw,credentials=/tmp/$user.cifs_creds$ids,ip=$ADDR\t0\t0\n";
+            mkdir("/$PROJROOT/$PNAME") unless -d "/$PROJROOT/$PNAME";
             if ( $share) {
                 print FSTAB "//$SHARE/share\t";
                 print FSTAB "/share\t$FSTYPE\t";
-                print FSTAB "rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n";
+                print FSTAB "rw,credentials=/tmp/$user.cifs_creds$ids,ip=$ADDR\t0\t0\n";
 
                 mkdir("/share") unless -d "/share";