From a2c243875e74bf668c9103329e3dc8239c9a61d8 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@oath.com>
Date: Tue, 19 Dec 2017 09:32:46 +0100
Subject: Skip checking config convergence for clustercontroller

---
 .../vespa/config/server/application/ApplicationConvergenceChecker.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'configserver')

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceChecker.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceChecker.java
index 39cd4629ff0..6eb942963c0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceChecker.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceChecker.java
@@ -35,7 +35,8 @@ public class ApplicationConvergenceChecker extends AbstractComponent {
 
     private final static Set<String> serviceTypesToCheck = new HashSet<>(Arrays.asList(
             "container",
-            "container-clustercontroller",
+            // TODO: Skip temporarily to avoid issues with clustercontrollers moving around. Add back when 6.188 is latest version in use
+            //"container-clustercontroller",
             "qrserver",
             "docprocservice",
             "searchnode",
-- 
cgit v1.2.3