Merge pull request #3378 from vespa-engine/arnej/cleanup-hostname

simplify single node case

3 files changed, 5 insertions, 12 deletions

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 7c32c286fba..99c079739b4 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
@@ -4,11 +4,9 @@ package com.yahoo.config.model.provision;
 import com.yahoo.config.model.api.HostProvisioner;
 import com.yahoo.config.provision.*;
 import com.yahoo.net.HostName;
-import com.yahoo.vespa.model.HostSystem;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.net.UnknownHostException;
 
 /**
  * A host provisioner used when there is no hosts.xml file (using localhost as the only host)
@@ -25,13 +23,8 @@ public class SingleNodeProvisioner implements HostProvisioner {
     private int counter = 0;
 
     public SingleNodeProvisioner() {
-        try {
-            host = new Host(HostSystem.lookupCanonicalHostname(HostName.getLocalhost()));
-            this.hostSpec = new HostSpec(host.hostname(), host.aliases());
-        }
-        catch (UnknownHostException e) {
-            throw new RuntimeException(e);
-        }
+        host = new Host(HostName.getLocalhost());
+        this.hostSpec = new HostSpec(host.hostname(), host.aliases());
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/Host.java b/config-model/src/main/java/com/yahoo/vespa/model/Host.java
index 27d5991154c..e4e1e029a1a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/Host.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/Host.java
@@ -50,7 +50,7 @@ public final class Host extends AbstractConfigProducer<AbstractConfigProducer<?>
             deployLogger().log(Level.WARNING, "Unable to find canonical hostname of host: " + hostname);
         }
         if ((null != canonical) && (! hostname.equals(canonical))) {
-            deployLogger().log(Level.WARNING, "Host named '" + hostname + "' will not receive any config " +
+            deployLogger().log(Level.WARNING, "Host named '" + hostname + "' may not receive any config " +
                                               "since it does not match its canonical hostname: " + canonical);
         }
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
index cc3f4a22966..e597e338314 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
@@ -95,7 +95,7 @@ public class VespaModelTestCase {
         LogdConfig.Builder b = new LogdConfig.Builder();
         b = (LogdConfig.Builder) model.getConfig(b, "");
         LogdConfig c = new LogdConfig(b);
-        assertEquals(HostSystem.lookupCanonicalHostname(HostName.getLocalhost()), c.logserver().host());
+        assertEquals(HostName.getLocalhost(), c.logserver().host());
 
         SlobroksConfig.Builder sb = new SlobroksConfig.Builder();
         sb = (com.yahoo.cloud.config.SlobroksConfig.Builder) model.getConfig(sb, "");
@@ -106,7 +106,7 @@ public class VespaModelTestCase {
         zb = (ZookeepersConfig.Builder) model.getConfig(zb, "");
         ZookeepersConfig zc = new ZookeepersConfig(zb);
         assertEquals(zc.zookeeperserverlist().split(",").length, 2);
-        assertTrue(zc.zookeeperserverlist().startsWith(HostSystem.lookupCanonicalHostname(HostName.getLocalhost())));
+        assertTrue(zc.zookeeperserverlist().startsWith(HostName.getLocalhost()));
 
         ApplicationIdConfig.Builder appIdBuilder = new ApplicationIdConfig.Builder();
         appIdBuilder = (ApplicationIdConfig.Builder) model.getConfig(appIdBuilder, "");