[geode-benchmarks] branch develop updated: Prevent too many keys being offered to ssh server (#103)

[jbarrett]

This is an automated email from the ASF dual-hosted git repository.

jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5062dcc  Prevent too many keys being offered to ssh server (#103)
5062dcc is described below

commit 5062dccfa91cb6acebb18cd396810932bce1163a
Author: Donal Evans <doev...@pivotal.io>
AuthorDate: Thu Sep 12 11:01:03 2019 -0700

    Prevent too many keys being offered to ssh server (#103)
---
 infrastructure/scripts/aws/copy_to_cluster.sh | 2 +-
 infrastructure/scripts/aws/run_on_cluster.sh  | 2 +-
 infrastructure/scripts/aws/run_tests.sh       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/infrastructure/scripts/aws/copy_to_cluster.sh 
b/infrastructure/scripts/aws/copy_to_cluster.sh
index 9b9a95c..9ae5fdc 100755
--- a/infrastructure/scripts/aws/copy_to_cluster.sh
+++ b/infrastructure/scripts/aws/copy_to_cluster.sh
@@ -60,7 +60,7 @@ if [[ -z "${AWS_ACCESS_KEY_ID}" ]]; then
   export AWS_PROFILE="geode-benchmarks"
 fi
 
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i 
~/.geode-benchmarks/${TAG}-privkey.pem"
+SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o 
IdentitiesOnly=yes -i ~/.geode-benchmarks/${TAG}-privkey.pem"
 HOSTS=`aws ec2 describe-instances --query 
'Reservations[*].Instances[*].PublicIpAddress' --filter 
"Name=tag:geode-benchmarks,Values=${TAG}" --output text`
 
 for host in ${HOSTS}; do
diff --git a/infrastructure/scripts/aws/run_on_cluster.sh 
b/infrastructure/scripts/aws/run_on_cluster.sh
index b959221..bcc218b 100755
--- a/infrastructure/scripts/aws/run_on_cluster.sh
+++ b/infrastructure/scripts/aws/run_on_cluster.sh
@@ -60,7 +60,7 @@ if [[ -z "${AWS_ACCESS_KEY_ID}" ]]; then
   export AWS_PROFILE="geode-benchmarks"
 fi
 
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i 
~/.geode-benchmarks/${TAG}-privkey.pem"
+SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o 
IdentitiesOnly=yes -i ~/.geode-benchmarks/${TAG}-privkey.pem"
 HOSTS=`aws ec2 describe-instances --query 
'Reservations[*].Instances[*].PublicIpAddress' --filter 
"Name=tag:geode-benchmarks,Values=${TAG}" --output text`
 
 for host in ${HOSTS}; do
diff --git a/infrastructure/scripts/aws/run_tests.sh 
b/infrastructure/scripts/aws/run_tests.sh
index 3dd4d0d..39d3590 100755
--- a/infrastructure/scripts/aws/run_tests.sh
+++ b/infrastructure/scripts/aws/run_tests.sh
@@ -141,7 +141,7 @@ fixRepoName() {
 BENCHMARK_REPO=$(fixRepoName ${BENCHMARK_REPO})
 REPO=$(fixRepoName ${REPO})
 
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i 
~/.geode-benchmarks/${TAG}-privkey.pem"
+SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o 
IdentitiesOnly=yes -i ~/.geode-benchmarks/${TAG}-privkey.pem"
 HOSTS=`aws ec2 describe-instances --query 
'Reservations[*].Instances[*].PrivateIpAddress' --filter 
"Name=tag:geode-benchmarks,Values=${TAG}" --output text`
 HOSTS=$(echo ${HOSTS} | tr ' ' ',')
 FIRST_INSTANCE=`aws ec2 describe-instances --query 
'Reservations[*].Instances[*].PublicIpAddress' --filter 
"Name=tag:geode-benchmarks,Values=${TAG}" --output text | cut -f 1`