Changeset a8b42b5

Timestamp:

Sep 16, 2008 5:14:34 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:

9d207bd

Parents:

291423b

Message:

master testbed does not need a SeerControl? field

File:

• fedd/fedd_create_experiment.py (modified) (2 diffs)

fedd/fedd_create_experiment.py

@@ -312 +312 @@
 
         if not self.scp_file("%s/%s/%s" % (tmpdir, tb, tclfile), user, host):
+            return False
+        # Clear the federation files
+        if not self.ssh_cmd(user, host, 
+                "/bin/sh -c \"'/bin/rm -rf %s'\"" % proj_dir):
+            return False
+        if not self.ssh_cmd(user, host, 
+                "/bin/sh -c \"'mkdir -p %s'\"" % proj_dir):
             return False
         # Clear and create the tarfiles and rpm directories
@@ -943 +950 @@
                         try:
                             cc = open("%s/%s/seer.conf" %
-                                    (self.tmpdir, self.current_gateways), 'w')
-                            print >>cc, "ControlNode: %s" % \
-                                    self.control_gateway
+                                    (self.tmpdir, self.current_gateways),
+                                    'w')
+                            if self.current_gateways != self.master:
+                                print >>cc, "ControlNode: %s" % \
+                                        self.control_gateway
                             print >>cc, "ExperimentID: %s/%s" % \
                                     ( tbparams[self.master]['project'], \