From 45a157851fa4c3003d271bdb45632bd14d831ec0 Mon Sep 17 00:00:00 2001
From: Frank Liepold <frank.liepold@1und1.de>
Date: Thu, 24 Apr 2014 13:35:04 +0200
Subject: [PATCH] test_suite: make ssh key file changeable via MARS_SSH_KEYFILE

---
 test_suite/README            | 3 ++-
 test_suite/default-main.conf | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test_suite/README b/test_suite/README
index 85da25d8..91a43412 100644
--- a/test_suite/README
+++ b/test_suite/README
@@ -342,7 +342,8 @@ MARS_INITIAL_PRIMARY_HOST and MARS_INITIAL_SECONDARY_HOST
 The tests are executed by ssh commands from your work station to the
 test hosts. These commands must not prompt for a password. Though a
 id file (for ssh -i <id-file>) with null password must be specified in
-main_ssh_idfile_opt (default-main.conf)
+main_ssh_idfile_opt (default-main.conf) or given via the environment variable
+MARS_SSH_KEYFILE
 
 All test hosts must have ssh access to each other without prompt for passwords
 (this is required by marsadm join-cluster).
diff --git a/test_suite/default-main.conf b/test_suite/default-main.conf
index 66385777..cd57f371 100644
--- a/test_suite/default-main.conf
+++ b/test_suite/default-main.conf
@@ -51,5 +51,5 @@ declare -g -A main_error_recovery_functions
 ## for batch ssh access from our work station to the involved hosts we need a
 ## id file without password.
 
-main_ssh_idfile_opt="-i $HOME/.ssh/id_dsa_no_pw"
+main_ssh_idfile_opt="-i ${MARS_SSH_KEYFILE:-$HOME/.ssh/id_dsa_no_pw}"