Changeset 7de1537 for fedd

Timestamp:

Dec 15, 2010 11:37:43 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

6635dd5

Parents:

f938d66

Message:

Remove the ssh_key parameters to the controller. They do nothing.

File:

• fedd/federation/experiment_control.py (modified) (2 diffs)

fedd/federation/experiment_control.py

@@ -151 +151 @@
         accessdb_file = config.get("experiment_control", "accessdb")
 
-        self.ssh_pubkey_file = config.get("experiment_control", 
-                "ssh_pubkey_file")
-        self.ssh_privkey_file = config.get("experiment_control",
-                "ssh_privkey_file")
         dt = config.get("experiment_control", "direct_transit")
         self.auth_type = config.get('experiment_control', 'auth_type') \
@@ -209 +205 @@
             raise service_error(service_error.internal, 
                     "Unknown auth_type: %s" % self.auth_type)
-
-
-        if self.ssh_pubkey_file:
-            try:
-                f = open(self.ssh_pubkey_file, 'r')
-                self.ssh_pubkey = f.read()
-                f.close()
-            except EnvironmentError:
-                raise service_error(service_error.internal,
-                        "Cannot read sshpubkey")
-        else:
-            raise service_error(service_error.internal, 
-                    "No SSH public key file?")
-
-        if not self.ssh_privkey_file:
-            raise service_error(service_error.internal, 
-                    "No SSH public key file?")
-
 
         if mapdb_file: