From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Mon, 2 May 2011 10:13:32 +0000 (+0200)
Subject: Take PL_SSH_KEY environment so that users may override the default ssh key
X-Git-Tag: nepi_v2~89
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d245775353cebd0a26fa137d49b5da52eafdebc4;p=nepi.git

Take PL_SSH_KEY environment so that users may override the default ssh key
---

diff --git a/test/testbeds/planetlab/execute.py b/test/testbeds/planetlab/execute.py
index 80e0fdf8..f864a675 100755
--- a/test/testbeds/planetlab/execute.py
+++ b/test/testbeds/planetlab/execute.py
@@ -27,7 +27,10 @@ class PlanetLabExecuteTestCase(unittest.TestCase):
         
         instance.defer_configure("homeDirectory", self.root_dir)
         instance.defer_configure("slice", slicename)
-        instance.defer_configure("sliceSSHKey", "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'],))
+        instance.defer_configure("sliceSSHKey", 
+            os.environ.get(
+                "PL_SSH_KEY",
+                "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'],) ) )
         instance.defer_configure("authUser", pl_user)
         instance.defer_configure("authPass", pl_pwd)