diff options
| author | hakonhall <hakon@yahoo-inc.com> | 2016-10-14 11:26:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 11:26:02 +0200 |
| commit | aec5a34fc520b066d99e3424d552031a914e26a5 (patch) | |
| tree | 5b58361ee85a99f9495f8188bf69f67bc11804ba /config-model/src/main/java/com/yahoo/config/model/provision | |
| parent | 9dbec23e389de09ccd67f6ac8d87710887dae3a6 (diff) | |
Revert "Revert "Use HostName for message bus, but fix HostName to work with dev machines""
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model/provision')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java | 3 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java index 6a5abee7cb3..fbd5e712d3d 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java @@ -2,7 +2,6 @@ package com.yahoo.config.model.provision; import com.google.common.collect.ImmutableMap; -import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.config.model.builder.xml.XmlHelper; import com.yahoo.net.HostName; import com.yahoo.text.XML; @@ -76,7 +75,7 @@ public class Hosts { throw new RuntimeException("Missing 'name' attribute for host."); } if ("localhost".equals(name)) { - name = HostName.getLocalhost(); + name = HostName.getHostName(); } final List<String> hostAliases = VespaDomBuilder.getHostAliases(hostE.getChildNodes()); if (hostAliases.isEmpty()) { diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java index fe8b3935fcf..fb706e7201f 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java @@ -26,7 +26,7 @@ public class SingleNodeProvisioner implements HostProvisioner { public SingleNodeProvisioner() { try { - host = new Host(HostSystem.lookupCanonicalHostname(HostName.getLocalhost())); + host = new Host(HostSystem.lookupCanonicalHostname(HostName.getHostName())); this.hostSpec = new HostSpec(host.hostname(), host.aliases()); } catch (UnknownHostException e) { |