Changeset 593e901 for fedd/federation/protogeni_access.py

Timestamp:

Mar 5, 2010 1:59:26 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

73e0a61

Parents:

c5b28bf

Message:

Checkpoint working federation w/PG (w/o routing yet...)

File:

• fedd/federation/protogeni_access.py (modified) (4 diffs)

fedd/federation/protogeni_access.py

@@ -760 +760 @@
                 if active == 'True':
                     print >>f, "active: True"
+                    print >>f, "ssh_port: %s" % ssh_port
                     if type in ('control', 'both'):
                         for s in [s for s in services \
@@ -777 +778 @@
                 print >>f, "ssh_privkey: /usr/local/federation/etc/%s" % \
                         secretkey_base
-                print >>f, "ssh_port: %s" % ssh_port
                 f.close()
             except IOError, e:
@@ -1036 +1036 @@
             # generation off longer.
             self.import_store_info(certfile, connInfo)
-            self.generate_portal_configs(topo, pubkey_base, 
-                    secretkey_base, tmpdir, master, ename, connInfo, 
-                    services)
+            #self.generate_portal_configs(topo, pubkey_base, 
+                    #secretkey_base, tmpdir, master, ename, connInfo, 
+                    #services)
             rspec = self.generate_rspec(topo, "%s/%s/" \
                     % (self.staging_dir, ename), master, connInfo)
@@ -1047 +1047 @@
                     cm_url=self.cm_url)
             rv = starter(self, aid, user, rspec, pubkey_base, secretkey_base,
+                    master, ename,
                     "%s/%s" % (self.staging_dir, ename), tmpdir, cf, cpw,
-                    certfile, topo, connInfo)
+                    certfile, topo, connInfo, services)
         except service_error, e:
             err = e