Less Docker

1 files changed, 16 insertions, 19 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 1d4265172a3..e356ee06ac6 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
@@ -10,35 +10,35 @@ import java.util.List;
  */
 public enum NodeType {
 
-    /** A node to be assigned to a tenant to run application workloads */
+    /** Node assignable to a tenant to run application workloads */
     tenant("Tenant node"),
 
-    /** A host of a set of (Docker) tenant nodes */
-    host("Tenant docker host", tenant),
+    /** Host of a tenant nodes */
+    host("Tenant host", tenant),
 
-    /** Nodes running the shared proxy layer */
+    /** Node serving the shared proxy layer */
     proxy("Proxy node"),
 
-    /** A host of a (Docker) proxy node */
-    proxyhost("Proxy docker host", proxy),
+    /** Host of a proxy node */
+    proxyhost("Proxy host", proxy),
 
-    /** A config server */
-    config("Config server"),
+    /** Config server node */
+    config("Config server node"),
 
-    /** A host of a (Docker) config server node */
-    confighost("Config docker host", config),
+    /** Host of a config server node */
+    confighost("Config server host", config),
 
-    /** A controller */
-    controller("Controller"),
+    /** Controller node */
+    controller("Controller node"),
 
-    /** A host of a (Docker) controller node */
+    /** Host of a controller node */
     controllerhost("Controller host", controller),
 
-    /** A host of multiple nodes, only used in {@link SystemName#dev} */
+    /** Host capable of running multiple node types, only used in {@link SystemName#dev} */
     devhost("Dev host", config, controller, tenant);
 
-    private final List<NodeType> childNodeTypes;
     private final String description;
+    private final List<NodeType> childNodeTypes;
 
     NodeType(String description, NodeType... childNodeTypes) {
         this.childNodeTypes = List.of(childNodeTypes);
@@ -71,10 +71,7 @@ public enum NodeType {
         return childNodeTypes;
     }
 
-    /**
-     * @param type Child {@link NodeType}
-     * @return true if the {@link NodeType} can run on this host, false otherwise.
-     */
+    /** Returns whether given node type can run on this */
     public boolean canRun(NodeType type) {
         return childNodeTypes.contains(type);
     }