aboutsummaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@oath.com>2018-11-19 14:16:00 +0100
committerValerij Fredriksen <valerijf@oath.com>2018-11-19 14:17:13 +0100
commit5c534db46d8a829ea8e9b98afaecb730e304273b (patch)
tree67228772679123056f5cff1b555d230f68c0dfe3 /configserver
parent812f5b1608a1f2d124c321cb6335fd69f0f0736b (diff)
Source container-environment
Diffstat (limited to 'configserver')
-rwxr-xr-xconfigserver/src/main/sh/start-configserver8
1 files changed, 8 insertions, 0 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index 8a1cbd0f0a8..4248372013e 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -98,6 +98,14 @@ fixddir ${VESPA_HOME}/var/zookeeper
fixfile ${VESPA_HOME}/var/zookeeper/myid
fixddir ${VESPA_HOME}/var/zookeeper/version-2
+# TODO: Remove after migrating config servers to docker containers
+CONTAINER_ENVIRONMENT_PATH=/home/y/conf/container-environment
+if [ -f "${CONTAINER_ENVIRONMENT_PATH}" ]
+then
+ echo "Sourcing ${CONTAINER_ENVIRONMENT_PATH}"
+ source "${CONTAINER_ENVIRONMENT_PATH}"
+fi
+
not_a_configserver () {
for hn in $(vespa-print-default configservers); do
if [ "$hn" = localhost ] || [ "$hn" = "${VESPA_HOSTNAME}" ]; then