diff options
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 12 | ||||
| -rw-r--r-- | container-disc/pom.xml | 5 | ||||
| -rw-r--r-- | standalone-container/pom.xml | 2 |
3 files changed, 14 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index f971aa97e6a..1aab98a115f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -187,6 +187,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { addEmbedderComponents(deployState, cluster, spec); addModelEvaluation(spec, cluster, context); + addVespaBundles(cluster); addModelEvaluationBundles(cluster); addProcessing(deployState, spec, cluster); @@ -583,6 +584,17 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return (child != null) ? Integer.parseInt(child.getTextContent()) : defaultValue; } + private void addVespaBundles(ApplicationContainerCluster cluster) { + // Skip model-evaluation bundles for node-admin + if (cluster.id().value().equals("node-admin")) return; + + Set<String> bundles = Set.of( + "container-search-and-docproc", "container-search-gui", "docprocs", + "linguistics-components", "vespaclient-container-plugin"); + bundles.forEach(b -> cluster.addPlatformBundle(PlatformBundles.absoluteBundlePath(b))); + addModelEvaluationBundles(cluster); + } + protected void addModelEvaluationBundles(ApplicationContainerCluster cluster) { /* These bundles are added to all application container clusters, even if they haven't * declared 'model-evaluation' in services.xml, because there are many public API packages diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 95f54e5d932..3e42b924ec6 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -188,13 +188,8 @@ <!-- Vespa bundles --> config-bundle-jar-with-dependencies.jar, configdefinitions-jar-with-dependencies.jar, - container-search-and-docproc-jar-with-dependencies.jar, - container-search-gui-jar-with-dependencies.jar, - docprocs-jar-with-dependencies.jar, hosted-zone-api-jar-with-dependencies.jar, jdisc-security-filters-jar-with-dependencies.jar, - linguistics-components-jar-with-dependencies.jar, - vespaclient-container-plugin-jar-with-dependencies.jar, vespa-athenz-jar-with-dependencies.jar, <!-- Apache http client repackaged as bundle --> diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index 86cad2ad012..b73212b96f6 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -99,6 +99,8 @@ config-model-api-jar-with-dependencies.jar, config-model-jar-with-dependencies.jar, container-disc-jar-with-dependencies.jar, + container-search-and-docproc-jar-with-dependencies.jar, + linguistics-components-jar-with-dependencies.jar, model-evaluation-jar-with-dependencies.jar, model-integration-jar-with-dependencies.jar, </discPreInstallBundle> |