diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 15:08:01 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 15:08:01 +0200 |
commit | e134f307f2e962d07ae2cf5a6299e355dc618a41 (patch) | |
tree | a357e1a19c84644e11c09cc152a39dc3ad41f3c2 /config-provisioning | |
parent | 2379745a7b67c155fd40398c5352982fb33b9005 (diff) |
Remove flavor stock concept
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java | 3 | ||||
-rw-r--r-- | config-provisioning/src/main/resources/configdefinitions/flavors.def | 6 |
2 files changed, 1 insertions, 8 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 d743466a5fb..93ca0a77806 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 @@ -19,7 +19,6 @@ public class Flavor { private boolean configured; private final String name; private final int cost; - private final boolean isStock; private final Type type; private final double bandwidth; private final boolean retired; @@ -33,7 +32,6 @@ public class Flavor { this.configured = true; this.name = flavorConfig.name(); this.cost = flavorConfig.cost(); - this.isStock = flavorConfig.stock(); this.type = Type.valueOf(flavorConfig.environment()); this.resources = new NodeResources(flavorConfig.minCpuCores(), flavorConfig.minMainMemoryAvailableGb(), @@ -50,7 +48,6 @@ public class Flavor { this.configured = false; this.name = resources.toString(); this.cost = 0; - this.isStock = true; this.type = Type.DOCKER_CONTAINER; this.bandwidth = 1; this.retired = false; diff --git a/config-provisioning/src/main/resources/configdefinitions/flavors.def b/config-provisioning/src/main/resources/configdefinitions/flavors.def index 1cfb18d2cd2..6d2a981427e 100644 --- a/config-provisioning/src/main/resources/configdefinitions/flavors.def +++ b/config-provisioning/src/main/resources/configdefinitions/flavors.def @@ -18,11 +18,7 @@ flavor[].replaces[].name string # the expected lifetime of the node (usually three years). flavor[].cost int default=0 -# A stock flavor is any flavor which we expect to buy more of in the future. -# Stock flavors are assigned to applications by cost priority. -# -# Non-stock flavors are used for nodes for which a fixed amount has already been purchased -# for some historical reason. These nodes are assigned to applications by exact match and ignoring cost. +# NOT USED flavor[].stock bool default=true # The type of node: BARE_METAL, VIRTUAL_MACHINE or DOCKER_CONTAINER |