diff options
author | Harald Musum <musum@oath.com> | 2017-11-28 13:07:54 +0100 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2017-11-28 13:07:54 +0100 |
commit | 484519647a1fa2ae89260b30987afb5e3922df30 (patch) | |
tree | 1cc6af87cbd76e447fbf81b8d8378765a20a52d0 /config-model/src/main/java/com/yahoo/config/model/deploy | |
parent | 366549a4805df6e42d97c814216f6693ffc1a7b6 (diff) |
Remove zone from DeployProperties
zone is already present in DeployState, no need to duplicate
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model/deploy')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java | 15 |
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); } } |