aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2022-09-19 10:46:27 +0200
committerMartin Polden <mpolden@mpolden.no>2022-09-19 10:48:52 +0200
commitcb92caabebc9faded4a54e158700f8b8b87cd6e3 (patch)
treed0129c02e88155b946751eb9291396eb2b2f9543 /node-repository
parent7662a7b87988964eed15684963b7134f0a4805f8 (diff)
Custom cloud account implies exclusivity in all environments
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java7
1 files changed, 2 insertions, 5 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 947a000eecf..75616d8d380 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
@@ -139,12 +139,9 @@ public class CapacityPolicies {
: new NodeResources(0.5, 2, 50, 0.3);
}
- /**
- * Returns whether the nodes requested can share physical host with other applications.
- * A security feature which only makes sense for prod.
- */
+ /** Returns whether the nodes requested can share physical host with other applications */
public boolean decideExclusivity(Capacity capacity, boolean requestedExclusivity) {
- if (zone.environment() == Environment.prod && capacity.cloudAccount().isPresent()) return true; // Implicit exclusive when using custom cloud account
+ if (capacity.cloudAccount().isPresent()) return true; // Implicit exclusive when using custom cloud account
return requestedExclusivity && (capacity.isRequired() || zone.environment() == Environment.prod);
}