summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java
diff options
context:
space:
mode:
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java')
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java29
1 files changed, 3 insertions, 26 deletions
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);
}
}