Changeset 3c7da22

Timestamp:

Sep 17, 2007 11:35:32 AM (17 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

f70f9c8

Parents:

a098fab

Message:

Parameterize federate.sh and smbmount.pl (several parameters were hard wired)

make_hosts runs on deter nodes when DETER is the master testbed. It puts
all the federated hosts into /etc/hosts

Location:

fedkit

Files:

• federate.sh (modified) (2 diffs)
• make_hosts (added)
• smbmount.pl (modified) (1 diff)
• splitter.pl (modified) (5 diffs)

fedkit/federate.sh

@@ -37 +37 @@
 cp /tmp/hosts /etc/hosts && rm /tmp/hosts
 
-GATEWAY=`$EMUDIR/tmcc -b syncserver | awk ' { match($0, /SERVER=[^[:space:]]+/); print substr($0,RSTART+8,RLENGTH-9);}'`
+# Get our gateway, share, and mount user from the configuration file.
+# There's probably a way to get all three at once, but this works.
+GATEWAY=`perl -ne '/ControlGateway:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
+SHARE=`perl -ne '/SMBShare:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
+SMBUSER=`perl -ne '/ProjectUser:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
 
 #
@@ -81 +85 @@
 echo "Mounting via SMB."
 
-exec "/tmp/$SMBMOUNT"
+exec "/tmp/$SMBMOUNT" $SHARE $SMBUSER $GATEWAY

fedkit/smbmount.pl

@@ -3 +3 @@
 
 $TMCC="/usr/local/etc/emulab/tmcc";
-$SHARE="USERS";
-$PUSER="jhickey";
-$ADDR=`cat /usr/local/etc/emulab/bossnode`;
+$SHARE=shift || "USERS";
+$PUSER=shift || "jhickey";
+$ADDR=shift || `cat /usr/local/etc/emulab/bossnode`;
 
 chomp $ADDR;

fedkit/splitter.pl

@@ -7 +7 @@
 use File::Copy;
 
-@scripts = ("federate.sh", "smbmount.pl");
+@scripts = ("federate.sh", "smbmount.pl", "make_hosts");
 $local_script_dir = ".";
 
@@ -233 +233 @@
 $tb_config = $opts{'testbeds'} || "./testbeds"; # testbed configurations
 $local_script_dir = $opts{'scriptdir'}; # Local scripts
+
+$smb_share = $opts{'smbshare'} ||       # Share to mount from the master
+    die "Must give an SMB share\n";
+$project_user = $opts{'smbuser'} ||     # User to mount project dirs as
+    die "Must give an SMB user\n";
+
 # For now specify these.  We may want to generate them later.
 $gw_pubkey = $opts{'gatewaypubkey'};
@@ -349 +355 @@
         next;
     };
+    # End of the gateways section.  Output the client config for this testbed
     /^#\s+End\s+gateways\s+\((\w+)\)/ && do {
         die "Mismatched gateway markers ($1, $gateways)\n" 
             unless !$gateways || $gateways == $1;
+
+        die "No control gateway for $gateways?" unless $control_gateway;
+        # Client config
+        $cc = new IO::File(">$tmpdir/$gateways/client.conf");
+        die "Can't open $tmpdir/$gateways/client.conf: $!\n" unless $cc;
+        print $cc "ControlGateway: $control_gateway\n";
+        print $cc "SMBShare: $smb_share\n";
+        print $cc "ProjectUser: $project_user\n";
+        $cc->close();
+        
         $gateways = 0;
         next;
@@ -389 +406 @@
         else { $active_end{"$gateways-$dtb"}++; $active = "true"; }
 
+        # This is used to create the client configuration.
+        $control_gateway = "$myname$sdomain"
+            if $type =~ /(control|both)/;
+
         # Write out the file
         open(GWCONFIG, ">$tmpdir/$gateways/$myname$sdomain.gw.conf") || 
@@ -585 +606 @@
 F</tmp> is used.
 
+=item SMBShare
+
+The SMB share on the master testbed that will be exported to remote clients.
+
+=item SMBUser
+
+The experiment user to mount project directories as.  This user needs to be a
+member of the exported experiment - that is one of the users in the project
+containing this experiment on the master testbed.
+
 =item Tclparse