summaryrefslogtreecommitdiffstats
path: root/config-provisioning
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2018-09-20 08:54:59 +0200
committerGitHub <noreply@github.com>2018-09-20 08:54:59 +0200
commit5ecf27f2099432ed15eeb4c5dbc0d2f3708bf0e1 (patch)
tree9b531655e50e7f2038399bf7750e0632848d4736 /config-provisioning
parentadc3f3eaee4e53f5c1b68ccb22a943f0148b6f0e (diff)
parent7feeb6f2e2fd1134e1fef3d99d49777f30cf8fa0 (diff)
Merge pull request #7012 from vespa-engine/mpolden/controller-infra-provisioner
Allocate nodes of type controller to controller app
Diffstat (limited to 'config-provisioning')
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java5
1 files changed, 4 insertions, 1 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 763118dbf03..32718524997 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
@@ -24,7 +24,10 @@ public enum NodeType {
config(false, "Config server"),
/** A host of a (docker) config server node */
- confighost(true, "Config docker host");
+ confighost(true, "Config docker host"),
+
+ /** A controller */
+ controller(true, "Controller");
private final boolean isDockerHost;
private final String description;