update bootstrap section of scripts

9 files changed, 81 insertions, 0 deletions

diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh
index 2523446639b..13c244768f8 100755
--- a/vespabase/src/rhel-prestart.sh
+++ b/vespabase/src/rhel-prestart.sh
@@ -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
 
diff --git a/vespabase/src/start-cbinaries.sh b/vespabase/src/start-cbinaries.sh
index 341bce0e192..08197304378 100755
--- a/vespabase/src/start-cbinaries.sh
+++ b/vespabase/src/start-cbinaries.sh
@@ -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
 
diff --git a/vespabase/src/start-tool.sh b/vespabase/src/start-tool.sh
index 4a2ddbb61cf..7c7b26db768 100755
--- a/vespabase/src/start-tool.sh
+++ b/vespabase/src/start-tool.sh
@@ -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
 
diff --git a/vespabase/src/start-vespa-base.sh b/vespabase/src/start-vespa-base.sh
index 096c63f9969..48518291c83 100755
--- a/vespabase/src/start-vespa-base.sh
+++ b/vespabase/src/start-vespa-base.sh
@@ -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
 
diff --git a/vespabase/src/stop-vespa-base.sh b/vespabase/src/stop-vespa-base.sh
index dde1cb880b0..e25c251dd75 100755
--- a/vespabase/src/stop-vespa-base.sh
+++ b/vespabase/src/stop-vespa-base.sh
@@ -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
 
diff --git a/vespabase/src/vespa-start-configserver.sh b/vespabase/src/vespa-start-configserver.sh
index 38a4249982e..7d717c4b1dc 100755
--- a/vespabase/src/vespa-start-configserver.sh
+++ b/vespabase/src/vespa-start-configserver.sh
@@ -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
 
diff --git a/vespabase/src/vespa-start-services.sh b/vespabase/src/vespa-start-services.sh
index fbc110dbdee..90a9667e402 100755
--- a/vespabase/src/vespa-start-services.sh
+++ b/vespabase/src/vespa-start-services.sh
@@ -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
 
diff --git a/vespabase/src/vespa-stop-configserver.sh b/vespabase/src/vespa-stop-configserver.sh
index 33532744ae3..88eefd38f3b 100755
--- a/vespabase/src/vespa-stop-configserver.sh
+++ b/vespabase/src/vespa-stop-configserver.sh
@@ -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
 
diff --git a/vespabase/src/vespa-stop-services.sh b/vespabase/src/vespa-stop-services.sh
index 8d519a5fa9e..2ca245b2c93 100755
--- a/vespabase/src/vespa-stop-services.sh
+++ b/vespabase/src/vespa-stop-services.sh
@@ -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