summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2016-06-21 13:55:53 +0200
committerGitHub <noreply@github.com>2016-06-21 13:55:53 +0200
commit268a3bf232c29eecfbb0131a07e1a7398f2cf2d1 (patch)
treee76a19180ea36252e69237eeb4d7d18d227f9afb /node-admin
parent5d76f522d0c9060beee044541faf98e00ed90c70 (diff)
parent04cb54650e0cae57d41366c6f141949ad8feee65 (diff)
Merge pull request #63 from yahoo/musum/ymon-not-used
Remove ymon dir, not used anymore
Diffstat (limited to 'node-admin')
-rwxr-xr-xnode-admin/scripts/node-admin.sh1
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java1
2 files changed, 0 insertions, 2 deletions
diff --git a/node-admin/scripts/node-admin.sh b/node-admin/scripts/node-admin.sh
index ae0fa94029b..cae3cf54d0d 100755
--- a/node-admin/scripts/node-admin.sh
+++ b/node-admin/scripts/node-admin.sh
@@ -123,7 +123,6 @@ function Start {
--volume "/home/docker/container-storage/node-admin$VESPA_HOME/var/vespa:$VESPA_HOME/var/vespa" \
--volume "/home/docker/container-storage/node-admin$VESPA_HOME/var/yca:$VESPA_HOME/var/yca" \
--volume "/home/docker/container-storage/node-admin$VESPA_HOME/var/ycore++:$VESPA_HOME/var/ycore++" \
- --volume "/home/docker/container-storage/node-admin$VESPA_HOME/var/ymon:$VESPA_HOME/var/ymon" \
--volume "/home/docker/container-storage/node-admin$VESPA_HOME/var/zookeeper:$VESPA_HOME/var/zookeeper" \
--env "CONFIG_SERVER_ADDRESS=$CONFIG_SERVER_HOSTNAME" \
--env "NETWORK_TYPE=$NETWORK_TYPE" \
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java
index 4ef7b1b0705..be7e4767f5a 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java
@@ -101,7 +101,6 @@ public class DockerImpl implements Docker {
getDefaults().underVespaHome("var/vespa"),
getDefaults().underVespaHome("var/yca"),
getDefaults().underVespaHome("var/ycore++"),
- getDefaults().underVespaHome("var/ymon"),
getDefaults().underVespaHome("var/zookeeper"));
private final DockerClient docker;