Changeset 9b3627e for fedd/federation/proxy_protogeni_segment.py

Timestamp:

Mar 9, 2010 1:08:05 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

4e9719b

Parents:

c2c153b

Message:

SEER support

File:

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

fedd/federation/proxy_protogeni_segment.py

@@ -191 +191 @@
                 'userconfig': client_null,
             }
+
+        def server_port(f, s):
+            p = urlparse(s.get('server', 'http://localhost'))
+            print >>f, 'port: remote:%s:%s:%s' % (p.port, p.hostname, p.port) 
+
+        def server_null(f,s): pass
+
+        def server_seer(f, s):
+            print >>f, 'seer: true'
+
+        server_service_out = {
+                'SMB': server_port,
+                'tmcd': server_port,
+                'userconfig': server_null,
+                'seer': server_seer,
+            }
         # XXX: end un hardcode this
 
@@ -231 +247 @@
                         for s in [s for s in services \
                                 if s.get('name', "") in parent.imports]:
-                            p = urlparse(s.get('server', 'http://localhost'))
-                            print >>f, 'port: remote:%s:%s:%s' % \
-                                    (p.port, p.hostname, p.port)
+                            server_service_out[s['name']](f, s)
 
                 if tunnelconfig:
@@ -251 +265 @@
             
             # XXX: This little seer config file needs to go away.
-            if not seer_out:
-                try:
-                    seerfn = "%s/seer.conf" % tmpdir
-                    f = open(seerfn, "w")
-                    if not master:
-                        print >>f, "ControlNode: control.%s.%s%s" % \
-                            (meid.lower(), mproj.lower(), mdomain)
-                    print >>f, "ExperimentID: %s" % mexp
-                    f.close()
-                except IOError, e:
-                    raise service_error(service_error.internal, 
-                            "Can't write seer.conf: %s" %e)
-                seer_out = True
+            #if not seer_out:
+                #try:
+                    #seerfn = "%s/seer.conf" % tmpdir
+                    #f = open(seerfn, "w")
+                    #if not master:
+                        #print >>f, "ControlNode: control.%s.%s%s" % \
+                            #(meid.lower(), mproj.lower(), mdomain)
+                    #print >>f, "ExperimentID: %s" % mexp
+                    #f.close()
+                #except IOError, e:
+                    #raise service_error(service_error.internal, 
+                            #"Can't write seer.conf: %s" %e)
+                #seer_out = True
 
             if not client_out and type in ('control', 'both'):
@@ -273 +287 @@
                                 s.get('visibility','') == 'import':
                             client_service_out[s['name']](f, s)
-                    # Does seer need this?
-                    # print >>f, "ExperimentID: %s/%s" % (mproj, meid)
+                    # Seer uses this to find credentials in the shared project
+                    # dir.
+                    print >>f, "ExperimentID: %s/%s" % (mproj, meid)
                     f.close()
                 except IOError, e:
@@ -326 +341 @@
 
     def configure_nodes(self, topo, nodes, user, host, sshd, sshd_config,
-            gate_cmd, node_cmd, pubkey, secretkey, stagingdir, tmpdir):
+            gate_cmd, node_cmd, pubkey, secretkey, federation_software, 
+            portal_software, stagingdir, tmpdir):
 
         fed_dir = "/usr/local/federation"
@@ -354 +370 @@
                                 % i.name)
                     
+                for l, f in federation_software:
+                    base = os.path.basename(f)
+                    print >>script, "%s %s@%s:%s/%s ." % \
+                            (scp, user, host, stagingdir, base)
+                    print >>script, \
+                            "%s -C %s -xzf %s" % (tar, l, base)
+
                 for s in e.software:
                     # XXX: Just tarfiles for now
@@ -364 +387 @@
                             "%s -C %s -xzf %s" % (tar, s.install, s_base)
                 for f in ('hosts', pubkey, secretkey, 'client.conf', 
-                        'userconf', 'seer.conf'):
+                        'userconf'):
                     print >>script, "%s %s@%s:%s/%s %s/etc" % \
                             (scp, user, host, stagingdir, f, fed_dir)
@@ -379 +402 @@
                             (scp, user, host, stagingdir, vname, fed_dir)
 
+                # Hackery dackery dock: the ProtoGENI python is really ancient.
+                # Get a modern version (though packaged for Mandrake (remember
+                # Mandrake?  good times, good times)) and install it for SEER.
+                python_rpm="python2.4-2.4-1pydotorg.i586.rpm"
+                print >>script, "%s %s@%s:%s/%s ." % \
+                        (scp, user, host, stagingdir, python_rpm)
+                print >>script, "rpm --install ./%s" % python_rpm
+                print >>script, "rm /usr/bin/python"
+                print >>script, "ln /usr/bin/python2.4 /usr/bin/python"
+                # Back to less hacky stuff
 
                 # Start commands
                 if e.get_attribute('portal') and gate_cmd:
+                    # Install portal software
+                    for l, f in portal_software:
+                        base = os.path.basename(f)
+                        print >>script, "%s %s@%s:%s/%s ." % \
+                                (scp, user, host, stagingdir, base)
+                        print >>script, \
+                                "%s -C %s -xzf %s" % (tar, l, base)
+
                     # Portals never have a user-specified start command
                     print >>script, gate_cmd
@@ -548 +589 @@
 
         # With manifest in hand, we can export the portal node names.
-        nodes = self.manifest_to_dict(manifest, ignore_debug=True)
+        nodes = self.manifest_to_dict(manifest)
         self.export_store_info(export_certfile, nodes, parent.ssh_port,
                 connInfo)
@@ -612 +653 @@
         self.configure_nodes(topo, nodes, user, parent.staging_host,
                 parent.sshd, parent.sshd_config, gate_cmd, node_cmd, 
-                pubkey, secretkey, stagingdir, tmpdir)
+                pubkey, secretkey, parent.federation_software, 
+                parent.portal_software, stagingdir, tmpdir)
 
         self.start_nodes(user, parent.staging_host,