diff options
Diffstat (limited to 'node-admin')
| -rwxr-xr-x | node-admin/src/main/sh/node-admin.sh | 7 | ||||
| -rw-r--r-- | node-admin/vespa-node-admin.spec | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/node-admin/src/main/sh/node-admin.sh b/node-admin/src/main/sh/node-admin.sh index 3cff2a636c2..10e7e3c5ef6 100755 --- a/node-admin/src/main/sh/node-admin.sh +++ b/node-admin/src/main/sh/node-admin.sh @@ -56,9 +56,12 @@ findroot () { findhost () { if [ "${VESPA_HOSTNAME}" = "" ]; then - VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1 + fi + validate="${VESPA_HOME}/bin/vespa-validate-hostname" + if [ -f "$validate" ]; then + "$validate" "${VESPA_HOSTNAME}" || exit 1 fi - vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 export VESPA_HOSTNAME } diff --git a/node-admin/vespa-node-admin.spec b/node-admin/vespa-node-admin.spec index f63f4b628e3..ef5ab4ef315 100644 --- a/node-admin/vespa-node-admin.spec +++ b/node-admin/vespa-node-admin.spec @@ -18,7 +18,6 @@ URL: http://vespa.ai Requires: bash Requires: java-1.8.0-openjdk-headless Requires: vespa-base = %{version} -Requires: vespa-lib = %{version} Requires: vespa-standalone-container = %{version} Requires: vespa-node-maintainer = %{version} Requires: vespa-log-utils = %{version} |