summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-03-23 12:17:34 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-03-23 12:17:34 +0100
commit49512deb96d4daa6d0be7ad652d3436a4985887c (patch)
tree0264437edb5625984adc783e8067e45972451a9a /config-model
parent0d1baa5e33382bc9703be676572283ac92dafcea (diff)
Restore turning use dedicated node off
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index e3357976a2b..5629956e8b9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -90,7 +90,9 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
private NodesSpecification createNodesSpecificationForLogserver() {
DeployState deployState = context.getDeployState();
- if (context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT && deployState.isHosted())
+ if (deployState.getProperties().useDedicatedNodeForLogserver() &&
+ context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT &&
+ deployState.isHosted())
return NodesSpecification.dedicated(1, context);
else
return NodesSpecification.nonDedicated(1, context);