summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2018-10-17 20:35:33 +0200
committerGitHub <noreply@github.com>2018-10-17 20:35:33 +0200
commit12a5fcc9b1f923db643e1e7c807d805eab72a752 (patch)
tree8540f8a93da09cfeff85067417d4ae3b0fb04c4b /node-admin
parent9c6c104a8be82c18c4aeff91f644be3f0c104afc (diff)
parentbfde715bfb1c4ad9108ae225f76ad0e0c6e6f6cd (diff)
Merge pull request #7343 from vespa-engine/mpolden/ca-bundle-path
Share CA bundle path on controller hosts
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java2
1 files changed, 1 insertions, 1 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 13ee623a74e..f1fc6776380 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
@@ -312,7 +312,7 @@ public class DockerOperationsImpl implements DockerOperations {
if (isInfrastructureHost(context.nodeType()))
command.withSharedVolume(varLibSia, varLibSia);
- if (context.nodeType() == NodeType.proxyhost)
+ if (context.nodeType() == NodeType.proxyhost || context.nodeType() == NodeType.controllerhost)
command.withSharedVolume(Paths.get("/opt/yahoo/share/ssl/certs"), Paths.get("/opt/yahoo/share/ssl/certs"));
if (context.nodeType() == NodeType.host)