diff options
| author | Harald Musum <musum@oath.com> | 2018-04-17 21:03:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-17 21:03:00 +0200 |
| commit | f04ebc1c6a0b0556e756935e4495a21a75f97ad6 (patch) | |
| tree | c8f7a1fca4abe8764546b29eb14067833b2402cf | |
| parent | 31eb7a0ec654ef296549970f4589379ba0f5f7a1 (diff) | |
| parent | 0da72302e8362f74b9a0ae36ee9d83d51a230af4 (diff) | |
Merge pull request #5614 from vespa-engine/hmusum/set-supported-env-variable-for-config-servers
Set VESPA_CONFIGSERVERS
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java index 1111727db98..3b74a6afaec 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java @@ -76,7 +76,8 @@ public class DockerOperationsImpl implements DockerOperations { containerName, node.hostname) .withManagedBy(MANAGER_NAME) - .withEnvironment("CONFIG_SERVER_ADDRESS", configServers) // TODO: Remove when all images support CONTAINER_ENVIRONMENT_SETTINGS + .withEnvironment("CONFIG_SERVER_ADDRESS", configServers) // TODO: Remove when all images support VESPA_CONFIGSERVERS + .withEnvironment("VESPA_CONFIGSERVERS", configServers) .withEnvironment("CONTAINER_ENVIRONMENT_SETTINGS", environment.getContainerEnvironmentResolver().createSettings(environment, node)) .withUlimit("nofile", 262_144, 262_144) |