summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-03-29 15:18:21 +0100
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-03-29 15:18:21 +0100
commit0fecb5eb2b0f0daab1252304dd8411982d4d8ef4 (patch)
tree328daffbbe2f211f53d7e52f96f5e6f583d56b1d
parent8352a5a98640a2f0612c38644f09e4e9ebd78a86 (diff)
No need to mount /opt/yahoo/share/ssl/certs anymore
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java5
1 files changed, 1 insertions, 4 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 e34e97dc2aa..d10fef3dc6c 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
@@ -295,7 +295,7 @@ public class DockerOperationsImpl implements DockerOperations {
context.pathInNodeUnderVespaHome("var/jdisc_container"),
context.pathInNodeUnderVespaHome("var/jdisc_core"),
context.pathInNodeUnderVespaHome("var/maven"),
- context.pathInNodeUnderVespaHome("var/mediasearch"),
+ context.pathInNodeUnderVespaHome("var/mediasearch"), // TODO: Remove when vespa-routing is no more
context.pathInNodeUnderVespaHome("var/run"),
context.pathInNodeUnderVespaHome("var/scoreboards"),
context.pathInNodeUnderVespaHome("var/service"),
@@ -321,9 +321,6 @@ public class DockerOperationsImpl implements DockerOperations {
if (isInfrastructureHost(context.nodeType()))
command.withSharedVolume(varLibSia, varLibSia);
- if (context.nodeType() == NodeType.proxy || context.nodeType() == NodeType.controller)
- command.withSharedVolume(Paths.get("/opt/yahoo/share/ssl/certs"), Paths.get("/opt/yahoo/share/ssl/certs"));
-
if (context.nodeType() == NodeType.tenant)
command.withSharedVolume(Paths.get("/var/zpe"), context.pathInNodeUnderVespaHome("var/zpe"));
}