diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2019-03-20 12:50:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 12:50:21 +0100 |
| commit | ba1c5b79c799d09ba3a691ebf03e562782d09224 (patch) | |
| tree | 845b5eefb1be94202b18b69a946505133027ab8d | |
| parent | b5ffed4ce1dcad6a3c1e206c4357f95740ad8e7b (diff) | |
| parent | 6f7cf61a0d4ceb6efabf24f7daa9044e41fa47c1 (diff) | |
Merge pull request #8847 from vespa-engine/revert-7692-freva/source-container-environment
Revert "Source container-environment"
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index b3fab139cfe..2589d5940ca 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -98,14 +98,6 @@ 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 |