summaryrefslogtreecommitdiffstats
path: root/config-model/src/main
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2021-07-01 02:32:09 +0200
committergjoranv <gv@verizonmedia.com>2021-07-02 16:14:09 +0200
commitf8e64bc63f7a0b33358526e816f1e34554c0ca28 (patch)
treea92fd0326cdfce9623fc3ce8a207c0af2ed5e581 /config-model/src/main
parentfcb699ac64db02e455a43c9397437158c47d2d21 (diff)
Preinstall model-evaluation bundles in standalone containers.
- Configserver needs them because the config-model uses their apis
Diffstat (limited to 'config-model/src/main')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java
index a37d0ef416f..a1f52cca9fd 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java
@@ -6,6 +6,7 @@ import com.yahoo.config.model.deploy.DeployState;
import com.yahoo.container.logging.FileConnectionLog;
import com.yahoo.vespa.model.container.ApplicationContainerCluster;
import com.yahoo.vespa.model.container.ContainerModel;
+import com.yahoo.vespa.model.container.ContainerModelEvaluation;
import com.yahoo.vespa.model.container.component.AccessLogComponent;
import com.yahoo.vespa.model.container.component.ConnectionLogComponent;
import com.yahoo.vespa.model.container.configserver.ConfigserverCluster;
@@ -61,6 +62,11 @@ public class ConfigServerContainerModelBuilder extends ContainerModelBuilder {
cluster.getHttp().getHttpServer().get().setHostedVespa(isHosted());
}
+ @Override
+ protected void addModelEvaluationBundles(ApplicationContainerCluster cluster) {
+ // Model evaluation bundles are pre-installed in the standalone container.
+ }
+
/** Note: using {@link CloudConfigOptions} as {@link DeployState#isHosted()} returns <em>false</em> for hosted configserver/controller */
private boolean isHosted() { return options.hostedVespa().orElse(Boolean.FALSE); }
}