Merge pull request #26017 from vespa-engine/revert-26010-freva/revert

Reapply "Require 2 vCPU for exclusive hosts in prod"

1 files changed, 3 insertions, 2 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
index 66895867623..a944bf62534 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
@@ -62,9 +62,10 @@ public class NodeResourceLimits {
     }
 
     private double minAdvertisedVcpu(ClusterSpec cluster) {
-        if (zone().environment() == Environment.dev && ! nodeRepository.exclusiveAllocation(cluster)) return 0.1;
-        if (cluster.type().isContent() && zone().environment().isProduction()) return 1.0;
         if (cluster.type() == ClusterSpec.Type.admin) return 0.1;
+        if (zone().environment().isProduction() && ! zone().system().isCd() && nodeRepository.exclusiveAllocation(cluster)) return 2;
+        if (zone().environment().isProduction() && cluster.type().isContent()) return 1.0;
+        if (zone().environment() == Environment.dev && ! nodeRepository.exclusiveAllocation(cluster)) return 0.1;
         return 0.5;
     }