Changeset 2c6128f for fedd/fedd_client.py

Timestamp:

Nov 5, 2008 1:37:28 AM (15 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:

9c166cf

Parents:

01308c9

Message:

Add support for a real fedkit tar file rather than the ad hoc script stuff.

File:

• fedd/fedd_client.py (modified) (4 diffs)

fedd/fedd_client.py

@@ -123 +123 @@
                 type="string", help="Use this username instead of the uid")
 
+class fedd_split_opts(fedd_create_opts):
+    def __init__(self, access_keys, add_key_callback=None, 
+            add_cert_callback=None):
+        fedd_create_opts.__init__(self, access_keys, add_key_callback,
+                add_cert_callback)
+        self.add_option('-t','--fedkit', action='store_true', dest='fedkit',
+                default=False,
+                help="get output suitable for federation kit install")
+
+
 class fedd_access_opts(fedd_create_opts):
     def __init__(self, access_keys, node_descs, add_key_callback=None, 
@@ -605 +615 @@
         access_keys = []
         # Process the options using the customized option parser defined above
-        parser = fedd_create_opts(access_keys, self.add_ssh_key,
+        parser = fedd_split_opts(access_keys, self.add_ssh_key,
                 self.add_x509_cert)
 
@@ -619 +629 @@
 
         if opts.cert != None: cert = opts.cert
+        else: cert = None
 
         if cert == None:
@@ -650 +661 @@
                 'description': { 'ns2description': exp_desc },
                 'master': opts.master,
+                'include_fedkit': opts.fedkit,
                 }