diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2020-06-24 13:01:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 13:01:31 +0200 |
| commit | 6821733667528dddeed658205358f6b9dda12090 (patch) | |
| tree | b42ad96a37dd5d3b0a2ee6a85f3e32c4e36c4e92 | |
| parent | c2b57fddcbc9beb3b866d579c6cd68a68590651e (diff) | |
| parent | 9ac30a7be83d3a0965fa49fdd2bffa5bd09f571b (diff) | |
Merge pull request #13688 from vespa-engine/freva/sparecount-0-in-aws
Set spare count 0 where we can provision on demand MERGEOK
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java index ff65dc18181..c4c062311e6 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java @@ -8,7 +8,6 @@ import com.yahoo.component.Version; import com.yahoo.concurrent.maintenance.JobControl; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.DockerImage; -import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeType; @@ -124,7 +123,7 @@ public class NodeRepository extends AbstractComponent { new DnsNameResolver(), DockerImage.fromString(config.dockerImage()), config.useCuratorClientCache(), provisionServiceProvider.getHostProvisioner().isPresent(), - zone.environment() == Environment.prod ? 1 : 0); + zone.environment().isProduction() && provisionServiceProvider.getHostProvisioner().isEmpty() ? 1 : 0); } /** |