diff options
| author | Harald Musum <musum@oath.com> | 2018-04-22 16:49:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 16:49:35 +0200 |
| commit | 416381813ecc71079cebdfc2fbea53db50714014 (patch) | |
| tree | 833157aba9163b421f31fa8c8a88d27d0342a771 | |
| parent | 532e7c07b5ef1bcdff64bff0cb75229967b8d795 (diff) | |
| parent | fd8be057e855d5a06a16b9d8fbc9768f52468b01 (diff) | |
Merge pull request #5656 from vespa-engine/hmusum/remove-CONFIG_SERVER_ADDRESS
Remove CONFIG_SERVER_ADDRESS, not used anymore
2 files changed, 0 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/DefaultContainerEnvironmentResolver.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/DefaultContainerEnvironmentResolver.java index ec759f716fb..c60781e4877 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/DefaultContainerEnvironmentResolver.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/DefaultContainerEnvironmentResolver.java @@ -10,7 +10,6 @@ public class DefaultContainerEnvironmentResolver implements ContainerEnvironment public String createSettings(Environment environment, NodeSpec node) { return new ContainerEnvironmentSettings() - .set("configServerAddresses", environment.getConfigServerHostNames()) .set("nodeType", node.nodeType) .set("cloud", environment.getCloud()) .build(); 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 5830f802d91..6754ca14aeb 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,6 @@ public class DockerOperationsImpl implements DockerOperations { containerName, node.hostname) .withManagedBy(MANAGER_NAME) - .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)) |