diff options
Diffstat (limited to 'config-model/src/main/java')
4 files changed, 5 insertions, 32 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java index 0cda1a2eb80..c39eb15b027 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java +++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java @@ -26,8 +26,7 @@ public final class ConfigModelContext { private ConfigModelContext(ApplicationType applicationType, DeployState deployState, - VespaModel vespaModel, - ConfigModelRepoAdder configModelRepoAdder, + VespaModel vespaModel, ConfigModelRepoAdder configModelRepoAdder, AbstractConfigProducer parent, String producerId) { this.applicationType = applicationType; diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java index d0bc04db08e..626b5bfbf5c 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java @@ -1,11 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.model.deploy; -import com.yahoo.component.Version; import com.yahoo.config.model.api.ConfigServerSpec; -import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.HostName; +import com.yahoo.component.Version; import java.net.URI; import java.util.ArrayList; @@ -26,8 +25,6 @@ public class DeployProperties { private final String athenzDnsSuffix; private final boolean hostedVespa; private final Version vespaVersion; - private final boolean enableLogServer; - private final ModelContext.Properties modelContextProperties; private final boolean isBootstrap; private final boolean isFirstTimeDeployment; private final boolean useDedicatedNodeForLogserver; @@ -43,15 +40,11 @@ public class DeployProperties { Version vespaVersion, boolean isBootstrap, boolean isFirstTimeDeployment, - boolean useDedicatedNodeForLogserver, - boolean enableLogServer, - ModelContext.Properties modelContextProperties) { + boolean useDedicatedNodeForLogserver) { this.loadBalancerName = loadBalancerName; this.ztsUrl = ztsUrl; this.athenzDnsSuffix = athenzDnsSuffix; this.vespaVersion = vespaVersion; - this.enableLogServer = enableLogServer; - this.modelContextProperties = modelContextProperties; this.multitenant = multitenant || hostedVespa || Boolean.getBoolean("multitenant"); this.applicationId = applicationId; this.serverSpecs.addAll(configServerSpecs); @@ -102,10 +95,6 @@ public class DeployProperties { public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; } - public boolean enableLogServer() { return enableLogServer; } - - public ModelContext.Properties getModelContextProperties() { return modelContextProperties; } - public static class Builder { private ApplicationId applicationId = ApplicationId.defaultId(); @@ -119,8 +108,6 @@ public class DeployProperties { private boolean isBootstrap = false; private boolean isFirstTimeDeployment = false; private boolean useDedicatedNodeForLogserver = false; - private boolean enableLogServer; - private ModelContext.Properties properties; public Builder applicationId(ApplicationId applicationId) { this.applicationId = applicationId; @@ -177,20 +164,10 @@ public class DeployProperties { return this; } - public Builder enableLogServer(boolean enableLogServer) { - this.enableLogServer = enableLogServer; - return this; - } - - public Builder modelContextProperties(ModelContext.Properties properties) { - this.properties = properties; - return this; - } - public DeployProperties build() { return new DeployProperties(multitenant, applicationId, configServerSpecs, loadBalancerName, hostedVespa, ztsUrl, athenzDnsSuffix, vespaVersion, isBootstrap, isFirstTimeDeployment, - useDedicatedNodeForLogserver, enableLogServer, properties); + useDedicatedNodeForLogserver); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java index 5609b96bdb6..d3f4a122b1e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java @@ -161,8 +161,6 @@ public class VespaModelFactory implements ModelFactory { .isBootstrap(properties.isBootstrap()) .isFirstTimeDeployment(properties.isFirstTimeDeployment()) .useDedicatedNodeForLogserver(properties.useDedicatedNodeForLogserver()) - .enableLogServer(properties.enableLogServer()) - .modelContextProperties(properties) .build(); } 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 fd266e7d771..db5409cdcdb 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 @@ -97,8 +97,7 @@ public class DomAdminV4Builder extends DomAdminBuilderBase { DeployState deployState = context.getDeployState(); if (deployState.getProperties().useDedicatedNodeForLogserver() && context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT && - deployState.isHosted() && - deployState.getProperties().enableLogServer()) + deployState.isHosted()) return NodesSpecification.dedicated(1, context); else return NodesSpecification.nonDedicated(1, context); |