diff options
author | Harald Musum <musum@oath.com> | 2018-09-14 15:12:00 +0200 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-09-14 15:12:00 +0200 |
commit | dbf3380a8a2ed84ec5cf62510a31aff252a2e1c6 (patch) | |
tree | 8287a41278192f79b81a2158ff227a6dd986ad4c /node-repository | |
parent | 64e7bb2d7c51deb181308aac7fd92675f2d29d1d (diff) |
Use requested flavor in all zones in CD
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | 2 |
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)); |