diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-06-08 10:04:30 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-06-08 10:04:30 +0200 |
commit | da0c3bcdf250b4975c931a4a86e37000c746084f (patch) | |
tree | d03ca5ce7bef567e5d031c0a1cc441f2b376fe43 /node-admin | |
parent | bab3573c0e9539a4616e2dc429ff6387b691a835 (diff) |
use vespaUser() from Defaults
Diffstat (limited to 'node-admin')
2 files changed, 7 insertions, 7 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java index fdc5489e95c..219fcb4a41c 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.hosted.node.admin.docker; import com.yahoo.net.HostName; -import com.yahoo.vespa.defaults.Defaults; +import static com.yahoo.vespa.defaults.Defaults.getDefaults; import com.yahoo.vespa.hosted.dockerapi.Container; import com.yahoo.vespa.hosted.dockerapi.ContainerName; import com.yahoo.vespa.hosted.dockerapi.Docker; @@ -61,7 +61,7 @@ public class LocalZoneUtils { else docker.deleteContainer(CONFIG_SERVER_CONTAINER_NAME); } - Path pathToConfigServerApp = Paths.get(Defaults.getDefaults().underVespaHome("conf/configserver-app")); + Path pathToConfigServerApp = Paths.get(getDefaults().underVespaHome("conf/configserver-app")); docker.createContainerCommand(dockerImage, CONFIG_SERVER_CONTAINER_NAME, CONFIG_SERVER_HOSTNAME) .withNetworkMode(DockerImpl.DOCKER_CUSTOM_MACVLAN_NETWORK_NAME) .withIpAddress(environment.getInetAddressForHost(CONFIG_SERVER_HOSTNAME)) @@ -75,7 +75,7 @@ public class LocalZoneUtils { .create(); docker.copyArchiveToContainer(pathToProjectRoot.resolve("node-admin/configserver-app").toString(), - CONFIG_SERVER_CONTAINER_NAME, Defaults.getDefaults().underVespaHome("conf")); + CONFIG_SERVER_CONTAINER_NAME, getDefaults().underVespaHome("conf")); docker.startContainer(CONFIG_SERVER_CONTAINER_NAME); } @@ -141,7 +141,7 @@ public class LocalZoneUtils { createCmd.create(); docker.startContainer(NODE_ADMIN_CONTAINER_NAME); - docker.executeInContainerAsRoot(NODE_ADMIN_CONTAINER_NAME, "chown", "yahoo", "/host/var/run/docker.sock"); + docker.executeInContainerAsRoot(NODE_ADMIN_CONTAINER_NAME, "chown", getDefaults().vespaUser(), "/host/var/run/docker.sock"); } public static Optional<ContainerNodeSpec> getContainerNodeSpec(String hostName) { @@ -223,7 +223,7 @@ public class LocalZoneUtils { } } System.out.println("prepare " + applicationName); - final String deployPath = Defaults.getDefaults().underVespaHome("bin/deploy"); + final String deployPath = getDefaults().underVespaHome("bin/deploy"); ProcessResult copyProcess = docker.executeInContainer(CONFIG_SERVER_CONTAINER_NAME, deployPath, "-e", tenantName, "-a", applicationName, "prepare", pathToAppOnConfigServer.toString()); if (! copyProcess.isSuccess()) { diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/SecretAgentScheduleMakerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/SecretAgentScheduleMakerTest.java index 55e71864bdb..c352dfbc0cf 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/SecretAgentScheduleMakerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/SecretAgentScheduleMakerTest.java @@ -67,12 +67,12 @@ public class SecretAgentScheduleMakerTest { @Test public void generateSecretAgentScheduleWithDifferentUserTest() { SecretAgentScheduleMaker scheduleMaker = new SecretAgentScheduleMaker("system-checks", 60, - Paths.get("/some/test")).withRunAsUser("yahoo"); + Paths.get("/some/test")).withRunAsUser("barfoo"); assertEquals( "- id: system-checks\n" + " interval: 60\n" + - " user: yahoo\n" + + " user: barfoo\n" + " check: /some/test\n", scheduleMaker.toString()); } } |