Added disk_allocation_ratio parameter
Allocation ratio was parametrised for all supported releases both for
computes and controller nodes
Related-Prod: PROD-28255
Change-Id: I4d1d88070d94cb88e2ca17688a303da2137e5212
diff --git a/nova/files/mitaka/nova-compute.conf.Debian b/nova/files/mitaka/nova-compute.conf.Debian
index b570570..05ec5d1 100644
--- a/nova/files/mitaka/nova-compute.conf.Debian
+++ b/nova/files/mitaka/nova-compute.conf.Debian
@@ -47,6 +47,10 @@
cpu_allocation_ratio = {{ compute.cpu_allocation_ratio }}
{%- endif %}
+{%- if compute.disk_allocation_ratio is defined %}
+disk_allocation_ratio = {{ compute.disk_allocation_ratio }}
+{%- endif %}
+
remove_unused_original_minimum_age_seconds=86400
image_service=nova.image.glance.GlanceImageService
diff --git a/nova/files/newton/nova-compute.conf.Debian b/nova/files/newton/nova-compute.conf.Debian
index 2540a43..c7ef466 100644
--- a/nova/files/newton/nova-compute.conf.Debian
+++ b/nova/files/newton/nova-compute.conf.Debian
@@ -63,6 +63,10 @@
cpu_allocation_ratio = {{ compute.cpu_allocation_ratio }}
{%- endif %}
+{%- if compute.disk_allocation_ratio is defined %}
+disk_allocation_ratio = {{ compute.disk_allocation_ratio }}
+{%- endif %}
+
#
# Defines which physical CPUs (pCPUs) can be used by instance
# virtual CPUs (vCPUs).
diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index b417f8c..f818791 100644
--- a/nova/files/ocata/nova-compute.conf.Debian
+++ b/nova/files/ocata/nova-compute.conf.Debian
@@ -610,7 +610,11 @@
# * Any valid positive integer or float value
# (floating point value)
# Minimum value: 0
+{%- if compute.disk_allocation_ratio is defined %}
+disk_allocation_ratio = {{ compute.disk_allocation_ratio }}
+{%- else %}
#disk_allocation_ratio=0.0
+{%- endif %}
#
# Console proxy host to be used to connect to instances on this host. It is the
diff --git a/nova/files/pike/nova-compute.conf.Debian b/nova/files/pike/nova-compute.conf.Debian
index 869f676..f4c233e 100644
--- a/nova/files/pike/nova-compute.conf.Debian
+++ b/nova/files/pike/nova-compute.conf.Debian
@@ -618,7 +618,11 @@
# * Any valid positive integer or float value
# (floating point value)
# Minimum value: 0
+{%- if compute.disk_allocation_ratio is defined %}
+disk_allocation_ratio = {{ compute.disk_allocation_ratio }}
+{%- else %}
#disk_allocation_ratio=0.0
+{%- endif %}
#
# Console proxy host to be used to connect to instances on this host. It is the
diff --git a/nova/files/queens/nova-compute.conf.Debian b/nova/files/queens/nova-compute.conf.Debian
index ea48184..631d0a2 100644
--- a/nova/files/queens/nova-compute.conf.Debian
+++ b/nova/files/queens/nova-compute.conf.Debian
@@ -669,7 +669,11 @@
# * Any valid positive integer or float value
# (floating point value)
# Minimum value: 0
+{%- if compute.disk_allocation_ratio is defined %}
+disk_allocation_ratio = {{ compute.disk_allocation_ratio }}
+{%- else %}
#disk_allocation_ratio = 0.0
+{%- endif %}
#
# Console proxy host to be used to connect to instances on this host.
diff --git a/nova/files/queens/nova-controller.conf.Debian b/nova/files/queens/nova-controller.conf.Debian
index 9dd16cc..bf97955 100644
--- a/nova/files/queens/nova-controller.conf.Debian
+++ b/nova/files/queens/nova-controller.conf.Debian
@@ -658,7 +658,11 @@
# * Any valid positive integer or float value
# (floating point value)
# Minimum value: 0
+{%- if controller.disk_allocation_ratio is defined %}
+disk_allocation_ratio = {{ controller.disk_allocation_ratio }}
+{%- else %}
#disk_allocation_ratio = 0.0
+{%- endif %}
#
# Console proxy host to be used to connect to instances on this host.
diff --git a/nova/files/rocky/nova-compute.conf.Debian b/nova/files/rocky/nova-compute.conf.Debian
index 2565618..b7cd838 100644
--- a/nova/files/rocky/nova-compute.conf.Debian
+++ b/nova/files/rocky/nova-compute.conf.Debian
@@ -541,7 +541,11 @@
# * Any valid positive integer or float value
# (floating point value)
# Minimum value: 0
+{%- if compute.disk_allocation_ratio is defined %}
+disk_allocation_ratio = {{ compute.disk_allocation_ratio }}
+{%- else %}
#disk_allocation_ratio = 0.0
+{%- endif %}
#
# Console proxy host to be used to connect to instances on this host. It is the
diff --git a/nova/files/rocky/nova-controller.conf.Debian b/nova/files/rocky/nova-controller.conf.Debian
index f5d9789..52efddd 100644
--- a/nova/files/rocky/nova-controller.conf.Debian
+++ b/nova/files/rocky/nova-controller.conf.Debian
@@ -532,7 +532,11 @@
# * Any valid positive integer or float value
# (floating point value)
# Minimum value: 0
+{%- if controller.disk_allocation_ratio is defined %}
+disk_allocation_ratio = {{ controller.disk_allocation_ratio }}
+{%- else %}
#disk_allocation_ratio = 0.0
+{%- endif %}
#
# Console proxy host to be used to connect to instances on this host. It is the
diff --git a/tests/pillar/compute_cluster.sls b/tests/pillar/compute_cluster.sls
index 79f5550..517fcda 100644
--- a/tests/pillar/compute_cluster.sls
+++ b/tests/pillar/compute_cluster.sls
@@ -15,6 +15,9 @@
resume_guests_state_on_host_boot: True
preallocate_images: space
instance_build_timeout: 600
+ cpu_allocation_ratio: 16.0
+ ram_allocation_ratio: 1.5
+ disk_allocation_ratio: 1.0
bind:
vnc_address: 127.0.0.1
vnc_port: 6080
diff --git a/tests/pillar/compute_single.sls b/tests/pillar/compute_single.sls
index 2ba3222..5a017be 100644
--- a/tests/pillar/compute_single.sls
+++ b/tests/pillar/compute_single.sls
@@ -9,6 +9,9 @@
resume_guests_state_on_host_boot: False
preallocate_images: space
cpu_mode: custom
+ cpu_allocation_ratio: 16.0
+ ram_allocation_ratio: 1.5
+ disk_allocation_ratio: 1.0
libvirt:
cpu_model: IvyBridge
bind: