diff options
author | Harald Musum <musum@oath.com> | 2018-03-06 13:55:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-06 13:55:00 +0100 |
commit | 6269f50d40db4a8502136373d76eb6afa9efe738 (patch) | |
tree | 3c6a46a2e6e238dce86a71a67ee48025fddab420 | |
parent | f29fd212b8a04e162b56e1a00925388af570efde (diff) | |
parent | a3cf14dfc2ca9169cfc160fe71f6320cb662abc4 (diff) |
Merge pull request #5221 from vespa-engine/freva/mount-sia-certs-directory
Mount sia directory if we are on configserverhost
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java | 1 | ||||
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java index ef97e08d7f3..c66d27f75c8 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java @@ -65,7 +65,6 @@ public class Environment { public Environment(ConfigServerConfig configServerConfig) { this(configServerConfig, - // TODO: Are these three ever set? Does not look like they are. How can this work then? getEnvironmentVariable(ENVIRONMENT), getEnvironmentVariable(REGION), getEnvironmentVariable(SYSTEM), 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 b9b0855fa30..1b5507eb534 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 @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.collections.Pair; +import com.yahoo.config.provision.NodeType; import com.yahoo.system.ProcessExecuter; import com.yahoo.vespa.hosted.dockerapi.Container; import com.yahoo.vespa.hosted.dockerapi.ContainerName; @@ -369,6 +370,10 @@ public class DockerOperationsImpl implements DockerOperations { directoriesToMount.put(environment.pathInNodeUnderVespaHome("var/zpe"), false); directoriesToMount.put(environment.pathInNodeUnderVespaHome("tmp"), false); directoriesToMount.put(environment.pathInNodeUnderVespaHome("var/container-data"), false); + + if (environment.getNodeType() == NodeType.confighost) { + directoriesToMount.put(Paths.get("/var/lib/sia"), false); + } return directoriesToMount; } |