diff options
4 files changed, 0 insertions, 30 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index 5e9125f560d..42af94b1d8e 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.model.container; import com.yahoo.cloud.config.ClusterInfoConfig; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.cloud.config.CuratorConfig; -import com.yahoo.cloud.config.RoutingProviderConfig; import com.yahoo.component.ComponentId; import com.yahoo.config.application.api.ApplicationMetaData; import com.yahoo.config.docproc.DocprocConfig; @@ -101,7 +100,6 @@ public abstract class ContainerCluster<CONTAINER extends Container> SemanticRulesConfig.Producer, DocprocConfig.Producer, ClusterInfoConfig.Producer, - RoutingProviderConfig.Producer, ConfigserverConfig.Producer, CuratorConfig.Producer { @@ -594,11 +592,6 @@ public abstract class ContainerCluster<CONTAINER extends Container> return isHostedVespa; } - @Override - public void getConfig(RoutingProviderConfig.Builder builder) { - builder.enabled(isHostedVespa); - } - public Map<String, String> concreteDocumentTypes() { return concreteDocumentTypes; } /** The configured service aliases for the service in this cluster */ diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index 21db5bd2d4a..72551900984 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.model.container; import com.yahoo.cloud.config.ClusterInfoConfig; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.cloud.config.CuratorConfig; -import com.yahoo.cloud.config.RoutingProviderConfig; import com.yahoo.cloud.config.ZookeeperServerConfig; import com.yahoo.component.ComponentId; import com.yahoo.config.application.api.DeployLogger; @@ -298,17 +297,6 @@ public class ContainerClusterTest { } @Test - public void requireThatRoutingProviderIsDisabledForNonHosted() { - DeployState state = new DeployState.Builder().properties(new TestProperties().setHostedVespa(false)).build(); - MockRoot root = new MockRoot("foo", state); - ApplicationContainerCluster cluster = new ApplicationContainerCluster(root, "container0", "container1", state); - RoutingProviderConfig.Builder builder = new RoutingProviderConfig.Builder(); - cluster.getConfig(builder); - RoutingProviderConfig config = new RoutingProviderConfig(builder); - assertFalse(config.enabled()); - } - - @Test public void requireThatBundlesForTesterApplicationAreInstalled() { List<String> expectedOnpremBundles = List.of("vespa-testrunner-components-jar-with-dependencies.jar", diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index 4868a6bba2e..2365fd22c01 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -48,8 +48,6 @@ vespa_generate_config(configdefinitions rank-profiles.def) install_config_definition(rank-profiles.def vespa.config.search.rank-profiles.def) vespa_generate_config(configdefinitions reindexing.def) install_config_definition(reindexing.def vespa.config.content.reindexing.reindexing.def) -vespa_generate_config(configdefinitions routing-provider.def) -install_config_definition(routing-provider.def cloud.config.routing-provider.def) vespa_generate_config(configdefinitions sentinel.def) install_config_definition(sentinel.def cloud.config.sentinel.def) vespa_generate_config(configdefinitions slobroks.def) diff --git a/configdefinitions/src/vespa/routing-provider.def b/configdefinitions/src/vespa/routing-provider.def deleted file mode 100755 index eedf4f3c86f..00000000000 --- a/configdefinitions/src/vespa/routing-provider.def +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# Configuration for the routing config provider - -# TODO Remove once YCA filter is removed - -namespace=cloud.config - -# disabled by default, automatically enabled for hosted vespa -enabled bool default=false |