diff options
Diffstat (limited to 'node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminConfig.java')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminConfig.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminConfig.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminConfig.java index 9caf1307aa4..d9726c88e4c 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminConfig.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminConfig.java @@ -14,14 +14,18 @@ public class NodeAdminConfig { private static final Logger logger = Logger.getLogger(NodeAdminConfig.class.getName()); private static final ObjectMapper mapper = new ObjectMapper(); - enum Mode { + public enum Mode { + aws_tenant, + config_server_host, tenant, - config_server_host } @JsonProperty("mode") public Mode mode = Mode.tenant; + @JsonProperty("docker") + public DockerAdminConfig docker = new DockerAdminConfig(); + public static NodeAdminConfig fromFile(File file) { if (!file.exists()) { return new NodeAdminConfig(); |