From dbf3380a8a2ed84ec5cf62510a31aff252a2e1c6 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 14 Sep 2018 15:12:00 +0200 Subject: Use requested flavor in all zones in CD --- .../com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'node-repository') 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)); -- cgit v1.2.3