diff options
author | Martin Polden <mpolden@mpolden.no> | 2018-10-03 13:17:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-03 13:17:15 +0200 |
commit | 34a575c8292deeefed1974ccc6ad89bab9587bee (patch) | |
tree | 39da5f11b1daa59d12d40ad0c55355dfcd84514b /config-provisioning | |
parent | 353f5b1af4947972b297ae922193ddf557e3ecb5 (diff) | |
parent | e0bfba1767eb5bf68b454dcb6b97b5f5709d317d (diff) |
Merge pull request #7181 from vespa-engine/mpolden/controllerhost-nodetype
Add controllerhost node type and application
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java index 32718524997..d56a7c3e298 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java @@ -11,23 +11,26 @@ public enum NodeType { /** A node to be assigned to a tenant to run application workloads */ tenant(false, "Tenant node"), - /** A host of a set of (docker) tenant nodes */ + /** A host of a set of (Docker) tenant nodes */ host(true, "Tenant docker host"), /** Nodes running the shared proxy layer */ proxy(false, "Proxy node"), - /** A host of a (docker) proxy node */ + /** A host of a (Docker) proxy node */ proxyhost(true, "Proxy docker host"), /** A config server */ config(false, "Config server"), - /** A host of a (docker) config server node */ + /** A host of a (Docker) config server node */ confighost(true, "Config docker host"), /** A controller */ - controller(true, "Controller"); + controller(false, "Controller"), + + /** A host of a (Docker) controller node */ + controllerhost(true, "Controller host"); private final boolean isDockerHost; private final String description; |