Flip default flag value

2 files changed, 2 insertions, 5 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 ffbf311fc0f..5bc3703c11c 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
@@ -6,7 +6,6 @@ import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.Zone;
-import com.yahoo.vespa.flags.BooleanFlag;
 import com.yahoo.vespa.flags.FetchVector;
 import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.flags.Flags;
@@ -24,12 +23,10 @@ import java.util.Optional;
 public class CapacityPolicies {
 
     private final Zone zone;
-    private final BooleanFlag useAdvertisedResourcesFlag;
     private final JacksonFlag<com.yahoo.vespa.flags.custom.NodeResources> defaultResourcesFlag;
 
     public CapacityPolicies(Zone zone, FlagSource flagSource) {
         this.zone = zone;
-        this.useAdvertisedResourcesFlag = Flags.USE_ADVERTISED_RESOURCES.bindTo(flagSource);
         this.defaultResourcesFlag = Flags.DEFAULT_RESOURCES.bindTo(flagSource);
     }
 
@@ -58,7 +55,8 @@ public class CapacityPolicies {
             resources = resources.withDiskSpeed(NodeResources.DiskSpeed.any);
 
         // Dev does not cap the cpu of containers since usage is spotty: Allocate just a small amount exclusively
-        if (zone.environment() == Environment.dev && !useAdvertisedResourcesFlag.value())
+        // Do not cap in AWS as hosts are allocated on demand and 1-to-1, so the node can use the entire host
+        if (zone.environment() == Environment.dev && !zone.region().value().contains("aws-"))
             resources = resources.withVcpu(0.1);
 
         return resources;
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
index 203f922d132..dee32513457 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
@@ -75,7 +75,6 @@ public class ProvisioningTester {
     private final CapacityPolicies capacityPolicies;
     private final ProvisionLogger provisionLogger;
     private final LoadBalancerServiceMock loadBalancerService;
-    private final InMemoryFlagSource flagSource = new InMemoryFlagSource();
 
     private int nextHost = 0;
     private int nextIP = 0;