svn commit: r1243111 - in /whirr/trunk: CHANGES.txt services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperCluster.java services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java

[as...@apache.org]

Author: asavu
Date: Sat Feb 11 17:39:36 2012
New Revision: 1243111

URL: http://svn.apache.org/viewvc?rev=1243111&view=rev
Log:
WHIRR-510. Get ZooKeeper ensemble with internal addresses (David Arthur via asavu)

Modified:
    whirr/trunk/CHANGES.txt
    whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperCluster.java
    whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java

Modified: whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1243111&r1=1243110&r2=1243111&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Sat Feb 11 17:39:36 2012
@@ -74,6 +74,9 @@ Trunk (unreleased changes)
     WHIRR-502. configure_cdh_hadoop.sh: syntax error trying to modify 
     permissions on $HADOOP_LOG_DIR (asavu)
 
+    WHIRR-510. Get ZooKeeper ensemble with internal addresses 
+    (David Arthur via asavu)
+
 Release 0.7.0 - 2011-12-11
 
   NEW FEATURES

Modified: whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperCluster.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperCluster.java?rev=1243111&r1=1243110&r2=1243111&view=diff
==============================================================================
--- whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperCluster.java (original)
+++ whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperCluster.java Sat Feb 11 17:39:36 2012
@@ -24,9 +24,15 @@ import org.apache.whirr.Cluster;
 import org.apache.whirr.RolePredicates;
 
 public class ZooKeeperCluster {
-  public static String getHosts(Cluster cluster) {
+  public static String getHosts(Cluster cluster, boolean internalHosts) {
     return Joiner.on(',').join(
       ZooKeeperClusterActionHandler.getHosts(cluster.getInstancesMatching(
-      RolePredicates.role(ZooKeeperClusterActionHandler.ZOOKEEPER_ROLE))));
+        RolePredicates.role(ZooKeeperClusterActionHandler.ZOOKEEPER_ROLE)
+      ), internalHosts)
+    );
+  }
+
+  public static String getHosts(Cluster cluster) {
+    return getHosts(cluster, false);
   }
 }

Modified: whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java?rev=1243111&r1=1243110&r2=1243111&view=diff
==============================================================================
--- whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java (original)
+++ whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java Sat Feb 11 17:39:36 2012
@@ -158,13 +158,22 @@ public class ZooKeeperClusterActionHandl
   }
 
   static List<String> getHosts(Set<Instance> instances) {
+    return getHosts(instances, false);
+  }
+
+  static List<String> getHosts(Set<Instance> instances, final boolean internalHost) {
     return Lists.transform(Lists.newArrayList(instances),
       new Function<Instance, String>() {
         @Override
         public String apply(Instance instance) {
           try {
-            String publicIp = instance.getPublicHostName();
-            return String.format("%s:%d", publicIp, CLIENT_PORT);
+            String host;
+            if(internalHost) {
+              host = instance.getPrivateHostName();
+            } else {
+              host = instance.getPublicHostName();
+            }
+            return String.format("%s:%d", host, CLIENT_PORT);
           } catch (IOException e) {
             throw new IllegalArgumentException(e);
           }