Crude public quota check

1 files changed, 5 insertions, 1 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 816396fe9b2..833ebaf837e 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
@@ -23,11 +23,15 @@ public class CapacityPolicies {
 
     public CapacityPolicies(Zone zone) {
         this.zone = zone;
-        this.isUsingAdvertisedResources = zone.region().value().contains("aws-");
+        this.isUsingAdvertisedResources = zone.cloud().value().equals("aws");
     }
 
     public int decideSize(Capacity capacity, ClusterSpec.Type clusterType) {
         int requestedNodes = ensureRedundancy(capacity.nodeCount(), clusterType, capacity.canFail());
+
+        if (this.zone.system().isPublic() && requestedNodes > 5)
+            throw new IllegalArgumentException(requestedNodes + " exceeds your quota. Please contact Vespa support");
+
         if (capacity.isRequired()) return requestedNodes;
 
         switch(zone.environment()) {