From f7feaef87bf1f8ccae3b3c9cb84de8ab94e1e4f2 Mon Sep 17 00:00:00 2001
From: Valerij Fredriksen <valerijf@oath.com>
Date: Thu, 29 Nov 2018 12:38:17 +0100
Subject: Revert "Revert "Do not set VESPA_CONFIGSERVERS in DockerOperations""

This reverts commit 84176f9
---
 .../vespa/hosted/node/admin/docker/DockerOperationsImpl.java      | 8 +-------
 .../vespa/hosted/node/admin/docker/DockerOperationsImplTest.java  | 3 +--
 .../vespa/hosted/node/admin/integrationTests/DockerTester.java    | 3 +--
 3 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'node-admin')

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 b40718ac7be..d6b370c4ec2 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
@@ -46,14 +46,11 @@ public class DockerOperationsImpl implements DockerOperations {
 
     private final Docker docker;
     private final ProcessExecuter processExecuter;
-    private final List<String> configServerHostnames;
     private final IPAddresses ipAddresses;
 
-    public DockerOperationsImpl(Docker docker, ProcessExecuter processExecuter,
-                                List<String> configServerHostnames, IPAddresses ipAddresses) {
+    public DockerOperationsImpl(Docker docker, ProcessExecuter processExecuter, IPAddresses ipAddresses) {
         this.docker = docker;
         this.processExecuter = processExecuter;
-        this.configServerHostnames = configServerHostnames;
         this.ipAddresses = ipAddresses;
     }
 
@@ -66,15 +63,12 @@ public class DockerOperationsImpl implements DockerOperations {
                 () -> new RuntimeException("Unable to find a valid IPv6 address for " + node.getHostname() +
                         ". Missing an AAAA DNS entry?"));
 
-        String configServers = String.join(",", configServerHostnames);
-
         Docker.CreateContainerCommand command = docker.createContainerCommand(
                 node.getWantedDockerImage().get(),
                 ContainerResources.from(node.getMinCpuCores(), node.getMinMainMemoryAvailableGb()),
                 context.containerName(),
                 node.getHostname())
                 .withManagedBy(MANAGER_NAME)
-                .withEnvironment("VESPA_CONFIGSERVERS", configServers)
                 .withUlimit("nofile", 262_144, 262_144)
                 // The nproc aka RLIMIT_NPROC resource limit works as follows:
                 //  - A process has a (soft) nproc limit, either inherited by the parent or changed with setrlimit(2).
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
index d93d33617e3..99b3fde4eb1 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
@@ -20,7 +20,6 @@ import org.mockito.InOrder;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.file.Paths;
-import java.util.Collections;
 import java.util.Optional;
 import java.util.OptionalLong;
 
@@ -40,7 +39,7 @@ public class DockerOperationsImplTest {
     private final ProcessExecuter processExecuter = mock(ProcessExecuter.class);
     private final IPAddresses ipAddresses = new IPAddressesMock();
     private final DockerOperationsImpl dockerOperations = new DockerOperationsImpl(
-            docker, processExecuter, Collections.emptyList(), ipAddresses);
+            docker, processExecuter, ipAddresses);
 
     @Test
     public void processResultFromNodeProgramWhenSuccess() {
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
index 5f6eb63acb5..cb3a1fb5e2c 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
@@ -29,7 +29,6 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Clock;
 import java.time.Duration;
-import java.util.Collections;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.logging.Logger;
@@ -90,7 +89,7 @@ public class DockerTester implements AutoCloseable {
 
         Clock clock = Clock.systemUTC();
         FileSystem fileSystem = TestFileSystem.create();
-        DockerOperations dockerOperations = new DockerOperationsImpl(docker, processExecuter, Collections.emptyList(), ipAddresses);
+        DockerOperations dockerOperations = new DockerOperationsImpl(docker, processExecuter, ipAddresses);
 
         MetricReceiverWrapper mr = new MetricReceiverWrapper(MetricReceiver.nullImplementation);
         Function<String, NodeAgent> nodeAgentFactory = (hostName) -> new NodeAgentImpl(
-- 
cgit v1.2.3