Complete cpu speed rollout

2 files changed, 2 insertions, 5 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
index 69510c9ccdd..2711406c216 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
@@ -28,13 +28,10 @@ public class Flavor {
 
     private final Optional<FlavorOverrides> flavorOverrides;
 
-    private static final double cpuSpeedupRolloutFactor = 2.0/3.0; // TODO: Increase to 1 on a later release
-
     /** Creates a *host* flavor from configuration */
     public Flavor(FlavorsConfig.Flavor flavorConfig) {
         this(flavorConfig.name(),
-             new NodeResources(flavorConfig.minCpuCores() *
-                                      (1 + (flavorConfig.cpuSpeedup() - 1) * cpuSpeedupRolloutFactor),
+             new NodeResources(flavorConfig.minCpuCores() * flavorConfig.cpuSpeedup(),
                                flavorConfig.minMainMemoryAvailableGb(),
                                flavorConfig.minDiskAvailableGb(),
                                flavorConfig.bandwidth() / 1000,
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
index 233a1472d8e..31eec77de6b 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
@@ -35,7 +35,7 @@ public class NodeFlavorsTest {
         Flavor banana = nodeFlavors.getFlavor("banana").get();
         assertEquals(3, banana.cost());
         assertEquals(10, banana.getMinCpuCores(), delta);
-        assertEquals("10 * (1 + 2*(1.3 - 1)/3", 12, banana.resources().vcpu(), delta);
+        assertEquals("10 * 1.3", 13, banana.resources().vcpu(), delta);
     }
 
 }