Remove unnecessary reprovisionToUpgradeOs cloud property

4 files changed, 4 insertions, 22 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
index 35e3a2bf5e2..4498d8de4c7 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
@@ -13,13 +13,11 @@ public class Cloud {
     private final CloudName name;
 
     private final boolean dynamicProvisioning;
-    private final boolean reprovisionToUpgradeOs;
     private final boolean requireAccessControl;
 
-    private Cloud(CloudName name, boolean dynamicProvisioning, boolean reprovisionToUpgradeOs, boolean requireAccessControl) {
+    private Cloud(CloudName name, boolean dynamicProvisioning, boolean requireAccessControl) {
         this.name = Objects.requireNonNull(name);
         this.dynamicProvisioning = dynamicProvisioning;
-        this.reprovisionToUpgradeOs = reprovisionToUpgradeOs;
         this.requireAccessControl = requireAccessControl;
     }
 
@@ -33,12 +31,6 @@ public class Cloud {
         return dynamicProvisioning;
     }
 
-    /** Returns whether upgrading OS on hosts in this requires the host to be reprovisioned */
-    // TODO(mpolden): Unused, remove this
-    public boolean reprovisionToUpgradeOs() {
-        return reprovisionToUpgradeOs;
-    }
-
     /** Returns whether to require access control for all clusters in this */
     public boolean requireAccessControl() {
         return requireAccessControl;
@@ -57,7 +49,6 @@ public class Cloud {
 
         private CloudName name = CloudName.DEFAULT;
         private boolean dynamicProvisioning = false;
-        private boolean reprovisionToUpgradeOs = false;
         private boolean requireAccessControl = false;
 
         public Builder() {}
@@ -72,18 +63,13 @@ public class Cloud {
             return this;
         }
 
-        public Builder reprovisionToUpgradeOs(boolean reprovisionToUpgradeOs) {
-            this.reprovisionToUpgradeOs = reprovisionToUpgradeOs;
-            return this;
-        }
-
         public Builder requireAccessControl(boolean requireAccessControl) {
             this.requireAccessControl = requireAccessControl;
             return this;
         }
 
         public Cloud build() {
-            return new Cloud(name, dynamicProvisioning, reprovisionToUpgradeOs, requireAccessControl);
+            return new Cloud(name, dynamicProvisioning, requireAccessControl);
         }
 
     }
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
index 1f1b3dc5699..1f8ba3ce93f 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
@@ -26,7 +26,6 @@ public class Zone {
         this(Cloud.builder()
                   .name(CloudName.from(configserverConfig.cloud()))
                   .dynamicProvisioning(cloudConfig.dynamicProvisioning())
-                  .reprovisionToUpgradeOs(cloudConfig.reprovisionToUpgradeOs())
                   .requireAccessControl(cloudConfig.requireAccessControl())
                   .build(),
              SystemName.from(configserverConfig.system()),
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java
index 0a6bdd3b6b8..aa295c47af0 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java
@@ -35,8 +35,8 @@ public interface ZoneList extends ZoneFilter {
     /** Only the given zones — combine with not() for best effect! */
     ZoneList among(ZoneId... zones);
 
-    /** Zones where hosts must be reprovisioned to upgrade their OS */
-    ZoneList reprovisionToUpgradeOs();
+    /** Zones where hosts are dynamically provisioned */
+    ZoneList dynamicallyProvisioned();
 
     /** Zones where traffic is routed using given method */
     ZoneList routingMethod(RoutingMethod method);
diff --git a/config-provisioning/src/main/resources/configdefinitions/config.provisioning.cloud.def b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.cloud.def
index 8673789db26..a5ad0dc9a7c 100644
--- a/config-provisioning/src/main/resources/configdefinitions/config.provisioning.cloud.def
+++ b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.cloud.def
@@ -9,8 +9,5 @@ dynamicProvisioning bool default=false
 # Can nodes belonging to different applications be placed on the same host?
 allowHostSharing bool default=true
 
-# Do we need to reprovision a host to upgrade its operating system?
-reprovisionToUpgradeOs bool default=false
-
 # Should clusters in this cloud always require access control for both read and write operations?
 requireAccessControl bool default=false