diff options
author | Håkon Hallingstad <hakon@yahoo-inc.com> | 2016-10-14 11:58:08 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@yahoo-inc.com> | 2016-10-14 11:58:08 +0200 |
commit | 9d8ce0a374b4a01c330a6873d41bd13d8c60da18 (patch) | |
tree | 7e5b4ddd70a567df43e85ca7a55c97060f54e7ab /config-model/src/main/java/com/yahoo/config/model/provision | |
parent | aec5a34fc520b066d99e3424d552031a914e26a5 (diff) |
Revert rename of public HostName.getLocalhost
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 | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java | 2 |
2 files changed, 2 insertions, 2 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 fbd5e712d3d..ed254bf3e08 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 @@ -75,7 +75,7 @@ public class Hosts { throw new RuntimeException("Missing 'name' attribute for host."); } if ("localhost".equals(name)) { - name = HostName.getHostName(); + name = HostName.getLocalhost(); } 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 fb706e7201f..fe8b3935fcf 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.getHostName())); + host = new Host(HostSystem.lookupCanonicalHostname(HostName.getLocalhost())); this.hostSpec = new HostSpec(host.hostname(), host.aliases()); } catch (UnknownHostException e) { |