summaryrefslogtreecommitdiffstats
path: root/config-provisioning
diff options
context:
space:
mode:
authorGeir Storli <geirst@yahoo-inc.com>2017-04-26 09:01:01 +0200
committerGeir Storli <geirst@yahoo-inc.com>2017-04-26 09:08:32 +0200
commit22dedb34f193bf14e224103aedb59d86845cf715 (patch)
tree09c1c4bde8587dcd03c4c8193b59f6f25d68c34a /config-provisioning
parent646c9cd19bd29a9a6d69adf03f2aebb089869550 (diff)
Add config for whether the disk is fast or slow (default is fast).
Diffstat (limited to 'config-provisioning')
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java4
-rw-r--r--config-provisioning/src/main/resources/configdefinitions/flavors.def3
2 files changed, 7 insertions, 0 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 fff1d53b50e..dbece80bf72 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
@@ -22,6 +22,7 @@ public class Flavor {
private final double minCpuCores;
private final double minMainMemoryAvailableGb;
private final double minDiskAvailableGb;
+ private final boolean fastDisk;
private final String description;
private final boolean retired;
private List<Flavor> replacesFlavors;
@@ -39,6 +40,7 @@ public class Flavor {
this.minCpuCores = flavorConfig.minCpuCores();
this.minMainMemoryAvailableGb = flavorConfig.minMainMemoryAvailableGb();
this.minDiskAvailableGb = flavorConfig.minDiskAvailableGb();
+ this.fastDisk = flavorConfig.fastDisk();
this.description = flavorConfig.description();
this.retired = flavorConfig.retired();
}
@@ -60,6 +62,8 @@ public class Flavor {
public double getMinDiskAvailableGb() { return minDiskAvailableGb; }
+ public boolean hasFastDisk() { return fastDisk; }
+
public double getMinCpuCores() { return minCpuCores; }
public String getDescription() { return description; }
diff --git a/config-provisioning/src/main/resources/configdefinitions/flavors.def b/config-provisioning/src/main/resources/configdefinitions/flavors.def
index edcd957c0b2..6c94194878a 100644
--- a/config-provisioning/src/main/resources/configdefinitions/flavors.def
+++ b/config-provisioning/src/main/resources/configdefinitions/flavors.def
@@ -37,6 +37,9 @@ flavor[].minMainMemoryAvailableGb double default=0.0
# The minimum amount of disk available.
flavor[].minDiskAvailableGb double default=0.0
+# Whether the disk is fast (typically SSD) or slow (typically spinning HDD).
+flavor[].fastDisk bool default=true
+
# Human readable free text for description of node.
flavor[].description string default=""