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.java15
1 files changed, 2 insertions, 13 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 3e96b225226..68d107e9e80 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
@@ -24,18 +24,15 @@ public class DeployProperties {
private final HostName loadBalancerName;
private final boolean hostedVespa;
private final Version vespaVersion;
- private final Zone zone;
private DeployProperties(boolean multitenant,
ApplicationId applicationId,
List<ConfigServerSpec> configServerSpecs,
HostName loadBalancerName,
boolean hostedVespa,
- Version vespaVersion,
- Zone zone) {
+ Version vespaVersion) {
this.loadBalancerName = loadBalancerName;
this.vespaVersion = vespaVersion;
- this.zone = zone;
this.multitenant = multitenant || hostedVespa || Boolean.getBoolean("multitenant");
this.applicationId = applicationId;
this.serverSpecs.addAll(configServerSpecs);
@@ -68,8 +65,6 @@ public class DeployProperties {
return vespaVersion;
}
- public Zone zone() { return zone; }
-
public static class Builder {
private ApplicationId applicationId = ApplicationId.defaultId();
@@ -78,7 +73,6 @@ public class DeployProperties {
private HostName loadBalancerName;
private boolean hostedVespa = false;
private Version vespaVersion = Version.fromIntValues(1, 0, 0);
- private Zone zone = Zone.defaultZone();
public Builder applicationId(ApplicationId applicationId) {
this.applicationId = applicationId;
@@ -110,13 +104,8 @@ public class DeployProperties {
return this;
}
- public Builder zone(Zone zone) {
- this.zone = zone;
- return this;
- }
-
public DeployProperties build() {
- return new DeployProperties(multitenant, applicationId, configServerSpecs, loadBalancerName, hostedVespa, vespaVersion, zone);
+ return new DeployProperties(multitenant, applicationId, configServerSpecs, loadBalancerName, hostedVespa, vespaVersion);
}
}