From 06713664e8e18d0a58acd8bf349425fc723733e1 Mon Sep 17 00:00:00 2001
From: Valerij Fredriksen <valerijf@oath.com>
Date: Fri, 20 Apr 2018 12:11:29 +0200
Subject: Always use cluster group 0

---
 .../vespa/service/monitor/application/ConfigServerApplication.java   | 2 +-
 .../service/monitor/application/ConfigServerHostApplication.java     | 2 +-
 .../vespa/service/monitor/application/HostedVespaApplication.java    | 5 +++--
 .../vespa/service/monitor/application/ProxyHostApplication.java      | 3 +--
 .../vespa/service/monitor/application/TenantHostApplication.java     | 3 +--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java
index 4001c93aa69..120a12609e1 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java
@@ -34,7 +34,7 @@ public class ConfigServerApplication extends HostedVespaApplication {
 
     private ConfigServerApplication() {
         super("zone-config-servers", NodeType.config,
-                ClusterSpec.Type.admin, ClusterSpec.Id.from("zone-config-servers"), ClusterSpec.Group.from(1));
+                ClusterSpec.Type.admin, ClusterSpec.Id.from("zone-config-servers"));
     }
 
     public ApplicationInstance toApplicationInstance(List<String> hostnames) {
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerHostApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerHostApplication.java
index 85bfea437fb..18420fe64a1 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerHostApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerHostApplication.java
@@ -10,6 +10,6 @@ public class ConfigServerHostApplication extends HostedVespaApplication {
 
     private ConfigServerHostApplication() {
         super("configserver-host", NodeType.confighost,
-                ClusterSpec.Type.container, ClusterSpec.Id.from("configserver-host"), ClusterSpec.Group.from(1));
+                ClusterSpec.Type.container, ClusterSpec.Id.from("configserver-host"));
     }
 }
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java
index efb060d624c..55965705567 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java
@@ -22,8 +22,9 @@ public abstract class HostedVespaApplication {
     private final ClusterSpec.Group clusterGroup;
 
     protected HostedVespaApplication(String applicationName, NodeType nodeType,
-                                     ClusterSpec.Type clusterType, ClusterSpec.Id clusterId, ClusterSpec.Group clusterGroup) {
-        this(createHostedVespaApplicationId(applicationName), Capacity.fromRequiredNodeType(nodeType), clusterType, clusterId, clusterGroup);
+                                     ClusterSpec.Type clusterType, ClusterSpec.Id clusterId) {
+        this(createHostedVespaApplicationId(applicationName), Capacity.fromRequiredNodeType(nodeType),
+                clusterType, clusterId, ClusterSpec.Group.from(0));
     }
 
     protected HostedVespaApplication(ApplicationId applicationId, Capacity capacity,
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ProxyHostApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ProxyHostApplication.java
index 1800344ea98..c1af7a0977e 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ProxyHostApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ProxyHostApplication.java
@@ -9,7 +9,6 @@ public class ProxyHostApplication extends HostedVespaApplication {
     public static final ProxyHostApplication PROXY_HOST_APPLICATION = new ProxyHostApplication();
 
     private ProxyHostApplication() {
-        super("proxy-host", NodeType.proxyhost,
-                ClusterSpec.Type.container, ClusterSpec.Id.from("proxy-host"), ClusterSpec.Group.from(1));
+        super("proxy-host", NodeType.proxyhost, ClusterSpec.Type.container, ClusterSpec.Id.from("proxy-host"));
     }
 }
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/TenantHostApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/TenantHostApplication.java
index 5b23908a066..27879a03c08 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/TenantHostApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/TenantHostApplication.java
@@ -9,7 +9,6 @@ public class TenantHostApplication extends HostedVespaApplication {
     public static final TenantHostApplication TENANT_HOST_APPLICATION = new TenantHostApplication();
 
     private TenantHostApplication() {
-        super("tenant-host", NodeType.host,
-                ClusterSpec.Type.container, ClusterSpec.Id.from("tenant-host"), ClusterSpec.Group.from(1));
+        super("tenant-host", NodeType.host, ClusterSpec.Type.container, ClusterSpec.Id.from("tenant-host"));
     }
 }
-- 
cgit v1.2.3