diff options
| author | Eirik Nygaard <eirik@yahoo-inc.com> | 2016-10-14 08:43:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 08:43:26 +0200 |
| commit | 327fde0ff8a159ba142f23b5889c9ee8dcc3c29f (patch) | |
| tree | 2d08b72b781aadf4044210955da5c17f5f631ca9 /config-model/src/main/java/com/yahoo/config/model/provision | |
| parent | c09aadd28bed9cb485160a1cc046c6772d2db337 (diff) | |
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, 3 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..6a5abee7cb3 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,6 +2,7 @@ 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; @@ -75,7 +76,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) { |