1 files changed, 9 insertions, 0 deletions
diff --git a/zkfacade/src/main/sh/zkcli b/zkfacade/src/main/sh/zkcli
index d0c88e6932a..67866274709 100755
--- a/zkfacade/src/main/sh/zkcli
+++ b/zkfacade/src/main/sh/zkcli
@@ -54,7 +54,16 @@ findroot () {
     exit 1
 }
 
+findhost () {
+    if [ "${VESPA_HOSTNAME}" = "" ]; then
+        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+    fi
+    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
+    export VESPA_HOSTNAME
+}
+
 findroot
+findhost
 
 # END environment bootstrap section