Changeset 291423b

Timestamp:

Sep 15, 2008 5:35:11 PM (16 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:

a8b42b5

Parents:

c52c48d

Message:

SEER config support

Files:

• fedd/fedd_create_experiment.py (modified) (2 diffs)
• fedkit/federate.sh (modified) (1 diff)

fedd/fedd_create_experiment.py

@@ -32 +32 @@
     scripts = ["fed_bootstrap", "federate.sh", "smbmount.FreeBSD.pl",
         "smbmount.Linux.pl", "make_hosts", "fed-tun.pl", "fed-tun.ucb.pl",
-        "fed_evrepeater", "rc.accounts.patch"]
+        "fed_evrepeater", "rc.accounts.patch", "daemon.py",
+        "experiment-setup.py"]
     
     def __init__(self, 
@@ -940 +941 @@
                             raise service_error(service_error.internal,
                                     "Error creating client config")
+                        try:
+                            cc = open("%s/%s/seer.conf" %
+                                    (self.tmpdir, self.current_gateways), 'w')
+                            print >>cc, "ControlNode: %s" % \
+                                    self.control_gateway
+                            print >>cc, "ExperimentID: %s/%s" % \
+                                    ( tbparams[self.master]['project'], \
+                                    self.eid )
+                            cc.close()
+                        except IOError:
+                            raise service_error(service_error.internal,
+                                    "Error creating seer config")
                     else:
                         if self.trace_file:

fedkit/federate.sh

@@ -74 +74 @@
 SMBUSER=`$PERL -ne '/ProjectUser:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
 SMBPROJECT=`$PERL -ne '/ProjectName:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
+
+# XXX: modified seer daemon to read a config file.  Not in the tarfile yet.  If
+# we see one, and there's a /usr/seer/backend/daemon.py, replace that one with
+# the local one.
+if [ -e /usr/seer/backend/daemon.py ] && [ -e $SCRIPTDIR/daemon.py ]; then
+        /bin/cp $SCRIPTDIR/daemon.py /usr/seer/backend/daemon.py 
+fi
+
+if [ -e /usr/seer/backend/experiment-setup.py ] && [ -e $SCRIPTDIR/experiment-setup.py ]; then
+        /bin/cp $SCRIPTDIR/experiment-setup.py /usr/seer/backend/experiment-setup.py 
+fi
+
+# Copy the seer.conf to the local /tmp if there is one
+
+if [ -e $SCRIPTDIR/seer.conf ]; then
+        /bin/cp $SCRIPTDIR/seer.conf /tmp
+fi
 
 GWIP=`host -N 10 $GATEWAY | $PERL -ne 's/.* has address // && print;'`