summaryrefslogtreecommitdiffstats
path: root/docker-api
diff options
context:
space:
mode:
authorEirik Nygaard <eirik@yahoo-inc.com>2016-10-14 08:43:26 +0200
committerGitHub <noreply@github.com>2016-10-14 08:43:26 +0200
commit327fde0ff8a159ba142f23b5889c9ee8dcc3c29f (patch)
tree2d08b72b781aadf4044210955da5c17f5f631ca9 /docker-api
parentc09aadd28bed9cb485160a1cc046c6772d2db337 (diff)
Revert "Use HostName for message bus, but fix HostName to work with dev machines"
Diffstat (limited to 'docker-api')
-rw-r--r--docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
index c0ffe367259..5e5185bc6be 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
@@ -124,7 +124,7 @@ public class DockerImpl implements Docker {
if (! dockerClient.listNetworksCmd().withNameFilter(DOCKER_CUSTOM_MACVLAN_NETWORK_NAME).exec().isEmpty()) return;
// Use IPv6 address if there is a mix of IP4 and IPv6 by taking the longest address.
- List<InetAddress> hostAddresses = Arrays.asList(InetAddress.getAllByName(com.yahoo.net.HostName.getHostName()));
+ List<InetAddress> hostAddresses = Arrays.asList(InetAddress.getAllByName(com.yahoo.net.HostName.getLocalhost()));
InetAddress hostAddress = Collections.max(hostAddresses,
(o1, o2) -> o1.getAddress().length - o2.getAddress().length);
@@ -563,7 +563,7 @@ public class DockerImpl implements Docker {
private void setMetrics(MetricReceiverWrapper metricReceiver) {
Dimensions dimensions = new Dimensions.Builder()
- .add("host", HostName.getHostName())
+ .add("host", HostName.getLocalhost())
.add("role", "docker").build();
numberOfRunningContainersGauge = metricReceiver.declareGauge(dimensions, "containers.running");