From 5f20981c68ea4afbd25c57e7e46eac6c60ff9ab3 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@verizonmedia.com>
Date: Mon, 30 Mar 2020 23:11:29 +0200
Subject: Configure initially out of rotation for config servers

---
 .../model/container/component/FileStatusHandlerComponent.java     | 2 ++
 .../vespa/model/container/configserver/ConfigserverCluster.java   | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'config-model')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/FileStatusHandlerComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/FileStatusHandlerComponent.java
index ee61b34987a..3d9a1b2e665 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/FileStatusHandlerComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/FileStatusHandlerComponent.java
@@ -10,6 +10,7 @@ import com.yahoo.osgi.provider.model.ComponentModel;
  * @author Tony Vaagenes
  */
 public class FileStatusHandlerComponent extends Handler implements VipStatusConfig.Producer {
+
     public static final String CLASS = "com.yahoo.container.handler.VipStatusHandler";
 
     private final String fileName;
@@ -26,4 +27,5 @@ public class FileStatusHandlerComponent extends Handler implements VipStatusConf
         builder.accessdisk(true).
                 statusfile(fileName);
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
index 9b8d138a98a..470b82496a3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
@@ -9,6 +9,7 @@ import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.container.StatisticsConfig;
+import com.yahoo.container.core.VipStatusConfig;
 import com.yahoo.container.jdisc.config.HealthMonitorConfig;
 import com.yahoo.net.HostName;
 import com.yahoo.vespa.defaults.Defaults;
@@ -29,7 +30,8 @@ public class ConfigserverCluster extends AbstractConfigProducer
         ZookeeperServerConfig.Producer,
         ConfigserverConfig.Producer,
         StatisticsConfig.Producer,
-        HealthMonitorConfig.Producer {
+        HealthMonitorConfig.Producer,
+        VipStatusConfig.Producer {
     private final CloudConfigOptions options;
     private ContainerCluster containerCluster;
 
@@ -178,4 +180,8 @@ public class ConfigserverCluster extends AbstractConfigProducer
         builder.snapshot_interval(60.0);
     }
 
+    @Override
+    public void getConfig(VipStatusConfig.Builder builder) {
+        builder.initiallyInRotation(false);
+    }
 }
-- 
cgit v1.2.3