aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2018-06-03 09:40:54 +0200
committerAndreas Eriksen <andreer@pvv.ntnu.no>2018-06-03 09:40:54 +0200
commita98edada487056d6d155e7ab419734809acd20ef (patch)
treec3ade44655fcbaf97d72bb0be6653241fe7ccc89
parent53f3d3d5b06ad034a0f8a0f0e457b0d10033d574 (diff)
Restore code to previous functionality, except for intended change (#6064)
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java4
1 files changed, 2 insertions, 2 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 84a1d67a5d3..8cd877b25e5 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
@@ -93,8 +93,8 @@ public class DockerOperationsImpl implements DockerOperations {
// TODO When rolling out host-admin on-prem: Always map in /var/zpe from host + make sure zpu is configured on host
if (environment.getCloud().equalsIgnoreCase("yahoo")) {
- command.withVolume(environment.pathInHostFromPathInNode(containerName, Paths.get("var/zpe")).toString(),
- environment.pathInNodeUnderVespaHome("var/zpe").toString());
+ Path pathInNode = environment.pathInNodeUnderVespaHome("var/zpe");
+ command.withVolume(environment.pathInHostFromPathInNode(containerName, pathInNode).toString(), pathInNode.toString());
} else if (environment.getNodeType() == NodeType.host) {
command.withVolume("/var/zpe", environment.pathInNodeUnderVespaHome("var/zpe").toString());
}