summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-05-29 14:58:01 +0200
committerHarald Musum <musum@verizonmedia.com>2019-05-29 14:58:01 +0200
commit4a99a1a18f9662ba46c7f762c0f39935ec17a5e4 (patch)
treeea566a532206c1ffb203ddbeb30a8235338c2f89 /node-repository
parentd8c23121c70833132b99163c793f8d33c1f9bd8e (diff)
Use isCD so that this is done for all CD systems
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
index 15863e78039..94db765c08a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
@@ -5,7 +5,6 @@ import com.yahoo.config.provision.Capacity;
import com.yahoo.config.provision.ClusterSpec;
import com.yahoo.config.provision.Environment;
import com.yahoo.config.provision.NodeResources;
-import com.yahoo.config.provision.RegionName;
import com.yahoo.config.provision.SystemName;
import com.yahoo.config.provision.Zone;
@@ -48,7 +47,7 @@ public class CapacityPolicies {
if (resources.allocateByLegacyName()) return resources; // Modification not possible
// Allow slow disks in zones which are not performance sensitive
- if (zone.system() == SystemName.cd || zone.environment() == Environment.dev || zone.environment() == Environment.test)
+ if (zone.system().isCd() || zone.environment() == Environment.dev || zone.environment() == Environment.test)
resources = resources.withDiskSpeed(NodeResources.DiskSpeed.any);
// Dev does not cap the cpu of containers since usage is spotty: Allocate just a small amount exclusively
@@ -86,7 +85,7 @@ public class CapacityPolicies {
if (clusterType == ClusterSpec.Type.admin)
return new NodeResources(0.5, 3, 50);
- if (zone.system() == SystemName.cd && zone.environment().isTest())
+ if (zone.system().isCd() && zone.environment().isTest())
new NodeResources(4, 4, 50);
return new NodeResources(1.5, 8, 50);