Updated Branches: refs/heads/trunk cb3a3f6c0 -> 36747f34b
WHIRR-665. list of SSH commands should also identify host roles. Contributed by Steve Loughran. Project: http://git-wip-us.apache.org/repos/asf/whirr/repo Commit: http://git-wip-us.apache.org/repos/asf/whirr/commit/36747f34 Tree: http://git-wip-us.apache.org/repos/asf/whirr/tree/36747f34 Diff: http://git-wip-us.apache.org/repos/asf/whirr/diff/36747f34 Branch: refs/heads/trunk Commit: 36747f34b2aa0bcde28279fce5eba2676be296ac Parents: cb3a3f6 Author: Tom White <tomwh...@apache.org> Authored: Mon Oct 8 15:00:27 2012 +0100 Committer: Tom White <tomwh...@apache.org> Committed: Mon Oct 8 15:00:27 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../src/main/java/org/apache/whirr/util/Utils.java | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/whirr/blob/36747f34/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 0a91466..aa59450 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -14,6 +14,9 @@ Release 0.8.1 (unreleased changes) WHIRR-649. Make install_cdh_hadoop.sh idempotent, fast failing if already run. (Graham Gear via tomwhite) + WHIRR-665. list of SSH commands should also identify host roles. + (Steve Loughran via tomwhite) + BUG FIXES WHIRR-641. Improved parsing of config -> http://git-wip-us.apache.org/repos/asf/whirr/blob/36747f34/core/src/main/java/org/apache/whirr/util/Utils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/whirr/util/Utils.java b/core/src/main/java/org/apache/whirr/util/Utils.java index ee93062..e9711c2 100644 --- a/core/src/main/java/org/apache/whirr/util/Utils.java +++ b/core/src/main/java/org/apache/whirr/util/Utils.java @@ -57,9 +57,19 @@ public class Utils { int counter = 0; for (Instance instance : cluster.getInstances()) { + StringBuilder roles = new StringBuilder(); + for (String role : instance.getRoles()) { + if (roles.length() != 0) { + roles.append('+'); + } + roles.append(role); + } out.printf( - "'ssh -i %s -o \"UserKnownHostsFile /dev/null\" -o StrictHostKeyChecking=no %s@%s'\n", - pkFile, user, instance.getPublicIp()); + "[%s]: ssh -i %s -o \"UserKnownHostsFile /dev/null\" -o StrictHostKeyChecking=no %s@%s\n", + roles.toString(), + pkFile, + user, + instance.getPublicIp()); if (counter > maxPrint) { out.println("... Too many instances, truncating.");
