Changeset 9b3627e for fedd/federation/protogeni_access.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/protogeni_access.py (modified) (4 diffs)

fedd/federation/protogeni_access.py

@@ -56 +56 @@
         """
 
+        def software_list(v):
+            l = [ ]
+            if v:
+                ps = v.split(" ")
+                while len(ps):
+                    loc, file = ps[0:2]
+                    del ps[0:2]
+                    l.append((loc, file))
+            return l
+
         # Make sure that the configuration is in place
         if not config: 
@@ -68 +78 @@
         self.userconfcmd = config.get("access","userconfcmd")
         self.userconfurl = config.get("access","userconfurl")
+        self.federation_software = config.get("access", "federation_software")
+        self.portal_software = config.get("access", "portal_software")
         self.ssh_port = config.get("access","ssh_port") or "22"
         self.sshd = config.get("access","sshd")
@@ -77 +89 @@
         self.staging_host = config.get("access", "staging_host") \
                 or "ops.emulab.net"
+   
+        self.federation_software = software_list(self.federation_software)
+        self.portal_software = software_list(self.portal_software)
 
         self.renewal_interval = config.get("access", "renewal") or (3 * 60 * 60)
@@ -970 +985 @@
                 get_url(s, certfile, softdir)
 
+            # Copy local portal node software to the tempdir
+            for s in (self.portal_software, self.federation_software):
+                for l, f in s:
+                    base = os.path.basename(f)
+                    copy_file(f, "%s/%s" % (softdir, base))
+
+            # Ick.  Put this python rpm in a place that it will get moved into
+            # the staging area.  It's a hack to install a modern (in a Roman
+            # sense of modern) python on ProtoGENI
+            python_rpm ="python2.4-2.4-1pydotorg.i586.rpm"
+            if os.access("./%s" % python_rpm, os.R_OK):
+                copy_file("./%s" % python_rpm, "%s/%s" % (softdir, python_rpm))
+
             for a in attrs:
                 if a['attribute'] in configs: