diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-06-01 14:42:11 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-06-01 14:42:11 +0200 |
| commit | e1f877e0b611a1408e78d124b8d282f1f8f7141a (patch) | |
| tree | 31934242e147b47fc821ab1b2c9d98e3930f851b /node-admin | |
| parent | 5c57852b26126d72b080fb6e0893dc3d633c28c1 (diff) | |
Map in common zpe directory if host and not yahoo cloud
Diffstat (limited to 'node-admin')
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java | 9 |
1 files changed, 8 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 ef5f2e60220..b5a072503ab 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 @@ -91,6 +91,14 @@ public class DockerOperationsImpl implements DockerOperations { command.withVolume("/var/lib/sia", "/var/lib/sia"); } + // TODO Remove this once host-admin is available on-prem + if (environment.getCloud().equalsIgnoreCase("yahoo")) { + command.withVolume(environment.pathInHostFromPathInNode(containerName, Paths.get("var/zpe")).toString(), + environment.pathInNodeUnderVespaHome("var/zpe").toString()); + } else if (environment.getNodeType() == NodeType.host) { + command.withVolume("/var/zpe", environment.pathInNodeUnderVespaHome("var/zpe").toString()); + } + if (environment.getNodeType() == NodeType.proxyhost) { command.withVolume("/opt/yahoo/share/ssl/certs/", "/opt/yahoo/share/ssl/certs/"); } @@ -354,7 +362,6 @@ public class DockerOperationsImpl implements DockerOperations { directoriesToMount.put(environment.pathInNodeUnderVespaHome("var/yca"), true); directoriesToMount.put(environment.pathInNodeUnderVespaHome("var/ycore++"), false); directoriesToMount.put(environment.pathInNodeUnderVespaHome("var/zookeeper"), false); - 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.proxyhost) |