Use requested flavor in all zones in CD

1 files changed, 2 insertions, 0 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 efa1cd3745d..6168d6fcf78 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
@@ -48,6 +48,8 @@ public class CapacityPolicies {
             return flavors.getFlavorOrThrow(requestedFlavor.get());
 
         String defaultFlavorName = zone.defaultFlavor(cluster.type());
+        if (zone.system() == SystemName.cd)
+            return flavors.getFlavorOrThrow(requestedFlavor.orElse(defaultFlavorName));
         switch(zone.environment()) {
             case dev : case test : case staging : return flavors.getFlavorOrThrow(defaultFlavorName);
             default : return flavors.getFlavorOrThrow(requestedFlavor.orElse(defaultFlavorName));