diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-06-14 13:54:00 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-06-19 18:08:32 +0200 |
commit | 62096f3dd3ebea27221ee0eb27a1e9d4700ed10c (patch) | |
tree | 1876d8babdc8d55c547bc877319968ca8db15f58 /config-provisioning | |
parent | fe77e46ff5bbf5c7ec2a0aa450213bb2806576b2 (diff) |
Remove description from flavor
Diffstat (limited to 'config-provisioning')
3 files changed, 0 insertions, 9 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index b6f692e776b..cf3f2d35bd7 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -391,7 +391,6 @@ "public boolean hasFastDisk()", "public double getBandwidth()", "public double getMinCpuCores()", - "public java.lang.String getDescription()", "public boolean isRetired()", "public com.yahoo.config.provision.Flavor$Type getType()", "public boolean isDocker()", 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 7ecab86529f..b393d9ee22a 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 @@ -24,7 +24,6 @@ public class Flavor { private final boolean isStock; private final Type type; private final double bandwidth; - private final String description; private final boolean retired; private List<Flavor> replacesFlavors; @@ -43,7 +42,6 @@ public class Flavor { flavorConfig.minDiskAvailableGb(), flavorConfig.fastDisk() ? NodeResources.DiskSpeed.fast : NodeResources.DiskSpeed.slow); this.bandwidth = flavorConfig.bandwidth(); - this.description = flavorConfig.description(); this.retired = flavorConfig.retired(); this.replacesFlavors = new ArrayList<>(); } @@ -60,7 +58,6 @@ public class Flavor { this.isStock = true; this.type = Type.DOCKER_CONTAINER; this.bandwidth = 1; - this.description = ""; this.retired = false; this.replacesFlavors = List.of(); this.resources = resources; @@ -97,8 +94,6 @@ public class Flavor { public double getMinCpuCores() { return resources.vcpu(); } - public String getDescription() { return description; } - /** Returns whether the flavor is retired */ public boolean isRetired() { return retired; diff --git a/config-provisioning/src/main/resources/configdefinitions/flavors.def b/config-provisioning/src/main/resources/configdefinitions/flavors.def index b765270df12..1cfb18d2cd2 100644 --- a/config-provisioning/src/main/resources/configdefinitions/flavors.def +++ b/config-provisioning/src/main/resources/configdefinitions/flavors.def @@ -43,9 +43,6 @@ flavor[].fastDisk bool default=true # Expected network interface bandwidth available for this flavor, in Mbit/s. flavor[].bandwidth double default=0.0 -# Human readable free text for description of node. -flavor[].description string default="" - # The flavor is retired and should no longer be used. flavor[].retired bool default=false |