From b1581fe802f290a563a1a3e633ded5c8efe4927a Mon Sep 17 00:00:00 2001
From: Martin Harris <github@nakomis.com>
Date: Fri, 5 Sep 2014 17:03:36 +0100
Subject: [PATCH] Updates sensors and curl commands to use localhost instead of
 getHostname() (required for Docker)

---
 .../entity/nosql/couchbase/CouchbaseNodeImpl.java         | 8 ++++----
 .../entity/nosql/couchbase/CouchbaseNodeSshDriver.java    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java b/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java
index 80d563f2cb..37446ce590 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java
@@ -84,9 +84,9 @@ public void init() {
             @Override
             public void onEvent(SensorEvent<Boolean> booleanSensorEvent) {
                 if (Boolean.TRUE.equals(booleanSensorEvent.getValue())) {
-                    String hostname = getAttribute(HOSTNAME);
-                    String webPort = getConfig(CouchbaseNode.COUCHBASE_WEB_ADMIN_PORT).iterator().next().toString();
-                    setAttribute(CouchbaseNode.COUCHBASE_WEB_ADMIN_URL, format("http://%s:%s", hostname, webPort));
+                    Integer webPort = getAttribute(CouchbaseNode.COUCHBASE_WEB_ADMIN_PORT);
+                    String hostAndPort = BrooklynAccessUtils.getBrooklynAccessibleAddress(CouchbaseNodeImpl.this, webPort).toString();
+                    setAttribute(CouchbaseNode.COUCHBASE_WEB_ADMIN_URL, format("http://%s", hostAndPort));
                 }
             }
         });
@@ -197,7 +197,7 @@ public void connectSensors() {
         Preconditions.checkNotNull(rawPort, "HTTP_PORT sensors not set for %s; is an acceptable port available?", this);
         HostAndPort hp = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, rawPort);
         
-        String adminUrl = String.format("http://%s:%s", hp.getHostText(), hp.getPort());
+        String adminUrl = String.format("http://%s", hp.toString());
         
         httpFeed = HttpFeed.builder()
             .entity(this)
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java
index 56a86232bd..aaceae4346 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java
@@ -145,7 +145,7 @@ public void launch() {
                 "for i in {0..120}\n" +
                 "do\n" +
                 "    if [ $i -eq 120 ]; then echo REST API unavailable after 120 seconds, failing; exit 1; fi;\n" +
-                "    curl -s " + String.format("http://%s:%s", getHostname(), getWebPort()) + " > /dev/null && echo REST API available after $i seconds && break\n" +
+                "    curl -s " + String.format("http://localhost:%s", getWebPort()) + " > /dev/null && echo REST API available after $i seconds && break\n" +
                 "    sleep 1\n" +
                 "done\n" +
                 couchbaseCli("cluster-init") +
@@ -161,7 +161,7 @@ public void launch() {
     public boolean isRunning() {
         //TODO add a better way to check if couchbase server is running
         return (newScript(CHECK_RUNNING)
-                .body.append(format("curl -u %s:%s http://%s:%s/pools/nodes", getUsername(), getPassword(), getHostname(), getWebPort()))
+                .body.append(format("curl -u %s:%s http://localhost:%s/pools/nodes", getUsername(), getPassword(), getWebPort()))
                 .execute() == 0);
     }
 
@@ -205,11 +205,11 @@ private String getWebPort() {
     }
 
     private String getCouchbaseHostnameAndCredentials() {
-        return format("-c %s:%s -u %s -p %s", getHostname(), getWebPort(), getUsername(), getPassword());
+        return format("-c localhost:%s -u %s -p %s", getWebPort(), getUsername(), getPassword());
     }
 
     private String getCouchbaseHostnameAndPort() {
-        return format("-c %s:%s", getHostname(), getWebPort());
+        return format("-c localhost:%s", getWebPort());
     }
 
     private String getClusterInitRamSize() {