diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-03-13 13:27:39 +0100 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-03-13 13:27:39 +0100 |
commit | 832692c4ba452526b2694b1424a6d4e9f335b3d1 (patch) | |
tree | 2fe91e5551982a95896ba6411a5eae77f2252942 | |
parent | 13616f1dcb496e2abec9665dd819045e13a44fa9 (diff) |
Restrict only motd and prompt with aws check
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java index b0732ff0462..336e947d7b4 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java @@ -261,9 +261,7 @@ public class NodeAgentImpl implements NodeAgent { } private void startContainer(ContainerNodeSpec nodeSpec) { - // ContainerData only works when root, which is the case only for HostAdmin so far. - if (environment.getRegion().startsWith("aws-")) - createContainerData(nodeSpec); + createContainerData(nodeSpec); dockerOperations.createContainer(containerName, nodeSpec); dockerOperations.startContainer(containerName, nodeSpec); aclMaintainer.run(); @@ -689,14 +687,18 @@ public class NodeAgentImpl implements NodeAgent { ContainerData containerData = ContainerData.createClean(environment, ContainerName.fromHostname(nodeSpec.hostname)); + // ContainerData only works when root, which is the case only for HostAdmin so far -- config nodes are only used under HostAdmin. if (nodeSpec.nodeType.equals(NodeType.config.name())) { logger.info("Creating files needed by config server"); new ConfigServerContainerData(environment, nodeSpec.hostname).writeTo(containerData); } - logger.info("Creating files for message of the day and the bash prompt"); - new MotdContainerData(nodeSpec, environment).writeTo(containerData); - new PromptContainerData(environment).writeTo(containerData); + // ContainerData only works when root, which is the case only for HostAdmin so far -- only AWS uses HostAdmin now. + if (environment.getRegion().startsWith("aws-")) { + logger.info("Creating files for message of the day and the bash prompt"); + new MotdContainerData(nodeSpec, environment).writeTo(containerData); + new PromptContainerData(environment).writeTo(containerData); + } } |