SeleniumHQ
diff --git a/‎java/server/src/org/openqa/grid/common/RegistrationRequest.java‎
Lines changed: 14 additions & 0 deletions b/‎java/server/src/org/openqa/grid/common/RegistrationRequest.java‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎java/server/src/org/openqa/grid/common/defaults/DefaultNodeWebDriver.json‎
Lines changed: 0 additions & 1 deletion b/‎java/server/src/org/openqa/grid/common/defaults/DefaultNodeWebDriver.json‎
Lines changed: 0 additions & 1 deletion
@@ -26,6 +26,7 @@
 import org.openqa.grid.common.exception.GridConfigurationException;
 import org.openqa.grid.internal.utils.configuration.GridNodeConfiguration;
 import org.openqa.selenium.Platform;
+import org.openqa.selenium.net.NetworkUtils;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.JsonToBeanConverter;
 
@@ -176,6 +177,7 @@ public static RegistrationRequest build(GridNodeConfiguration configuration) {
     if (configuration.host != null) {
       res.configuration.host = configuration.host;
     }
+    res.configuration.host = guessHost(res.configuration.host);
     if (configuration.port != null) {
       res.configuration.port = configuration.port;
     }
@@ -201,6 +203,18 @@ private void addPlatformInfoToCapabilities() {
     }
   }
 
+  private static String guessHost(String host) {
+    if (host == null || "ip".equalsIgnoreCase(host)) {
+      NetworkUtils util = new NetworkUtils();
+      return util.getIp4NonLoopbackAddressOfThisMachine().getHostAddress();
+    } else if ("host".equalsIgnoreCase(host)) {
+      NetworkUtils util = new NetworkUtils();
+      return util.getIp4NonLoopbackAddressOfThisMachine().getHostName();
+    } else {
+      return host;
+    }
+  }
+
   /**
    * add config, but overwrite capabilities.
    *
 
@@ -23,7 +23,6 @@
     "proxy": "org.openqa.grid.selenium.proxy.DefaultRemoteProxy",
     "maxSession": 5,
     "port": 5555,
-    "host": "localhost",
     "register": true,
     "registerCycle": 5000,
     "hub": "http://localhost:4444"