Remove default flavors

2 files changed, 0 insertions, 16 deletions

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 6c7da668e93..2eff081f42d 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
@@ -117,18 +117,6 @@ public class ConfigserverCluster extends AbstractConfigProducer
         if (options.system().isPresent()) {
             builder.environment(options.system().get());
         }
-        if (options.defaultFlavor().isPresent()) {
-            builder.defaultFlavor(options.defaultFlavor().get());
-        }
-        if (options.defaultAdminFlavor().isPresent()) {
-            builder.defaultAdminFlavor(options.defaultAdminFlavor().get());
-        }
-        if (options.defaultContainerFlavor().isPresent()) {
-            builder.defaultContainerFlavor(options.defaultContainerFlavor().get());
-        }
-        if (options.defaultContentFlavor().isPresent()) {
-            builder.defaultContentFlavor(options.defaultContentFlavor().get());
-        }
 
         builder.serverId(HostName.getLocalhost());
         if (!containerCluster.getHttp().getHttpServer().getConnectorFactories().isEmpty()) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
index eafff2374cb..2162550cadf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
@@ -36,10 +36,6 @@ public interface CloudConfigOptions {
     Optional<String> environment();
     Optional<String> region();
     Optional<String> system();
-    Optional<String> defaultFlavor();
-    Optional<String> defaultAdminFlavor();
-    Optional<String> defaultContainerFlavor();
-    Optional<String> defaultContentFlavor();
     Optional<Boolean> useVespaVersionInRequest();
     Optional<Integer> numParallelTenantLoaders();
     Optional<String> loadBalancerAddress();