Merge "[queens] set Neutron API retries, default to 3" into release/2019.2.0
diff --git a/nova/files/ocata/qemu.conf.Debian b/nova/files/ocata/qemu.conf.Debian
index cb20491..cc91d44 100644
--- a/nova/files/ocata/qemu.conf.Debian
+++ b/nova/files/ocata/qemu.conf.Debian
@@ -248,7 +248,7 @@
{%- endif %}
{%- if compute.qemu.dynamic_ownership is defined %}
-dynamic_ownership = "{{ compute.qemu.dynamic_ownership }}"
+dynamic_ownership = {{ compute.qemu.dynamic_ownership|int }}
{%- endif %}
{%- endif %}
diff --git a/nova/files/pike/nova-compute.conf.Debian b/nova/files/pike/nova-compute.conf.Debian
index 545065e..09df71b 100644
--- a/nova/files/pike/nova-compute.conf.Debian
+++ b/nova/files/pike/nova-compute.conf.Debian
@@ -6050,6 +6050,9 @@
{%- if compute.lvm.volume_clear_size is defined %}
volume_clear_size={{ compute.lvm.volume_clear_size }}
{%- endif %}
+{%- if compute.lvm.volume_clear_ionice_level is defined %}
+volume_clear_ionice_level={{compute.lvm.volume_clear_ionice_level}}
+{%- endif %}
{%- endif %}
# The ID of the image to boot from to rescue data from a corrupted instance.
@@ -6720,6 +6723,31 @@
#volume_clear_size=0
#
+# What I/O schedule class and priority level should be used when clearing
+# a volume. Only takes effect if ``volume_clear`` option is set to ``zero`` or
+# ``shred``. For more info about classes and priorities, check ``man ionice``.
+#
+# Possible values:
+#
+# * idle - use the Idle scheduling class. This option impacts system performance
+# the least with a downside of increased time for volume clearance
+# * from 0 to 7 - use the Best-effort scheduling class and set the priority level
+# to the specified number
+#
+# If not set - do not set I/O scheduling class explicitly. Usually, it's the most
+# aggressive option in terms of system performance impact.
+#
+# Related options:
+#
+# * images_type - must be set to ``lvm``
+# * volume_clear - must be set and the value must be different than ``none``
+# for this option to have any impact
+# (string value)
+# Possible values:
+# 'idle', '0', '1', '2', '3', '4', '5', '6', '7'
+#volume_clear_ionice_level=None
+
+#
# Enable snapshot compression for ``qcow2`` images.
#
# Note: you can set ``snapshot_image_format`` to ``qcow2`` to force all
diff --git a/nova/files/pike/nova-controller.conf.Debian b/nova/files/pike/nova-controller.conf.Debian
index dd40014..5b96ef8 100644
--- a/nova/files/pike/nova-controller.conf.Debian
+++ b/nova/files/pike/nova-controller.conf.Debian
@@ -6689,6 +6689,30 @@
#volume_clear_size=0
#
+# What I/O schedule class and priority level should be used when clearing
+# a volume. Only takes effect if ``volume_clear`` option is set to ``zero`` or
+# ``shred``. For more info about classes and priorities, check ``man ionice``.
+#
+# Possible values:
+#
+# * idle - use the Idle scheduling class. This option impacts system performance
+# the least with a downside of increased time for volume clearance
+# * from 0 to 7 - use the Best-effort scheduling class and set the priority level
+# to the specified number
+#
+# If not set - do not set I/O scheduling class explicitly. Usually, it's the most
+# aggressive option in terms of system performance impact.
+#
+# Related options:
+#
+# * images_type - must be set to ``lvm``
+# * volume_clear - must be set and the value must be different than ``none``
+# for this option to have any impact
+# (string value)
+# Possible values:
+# 'idle', '0', '1', '2', '3', '4', '5', '6', '7'
+#volume_clear_ionice_level=None
+#
# Enable snapshot compression for ``qcow2`` images.
#
# Note: you can set ``snapshot_image_format`` to ``qcow2`` to force all
diff --git a/nova/files/pike/qemu.conf.Debian b/nova/files/pike/qemu.conf.Debian
index cb20491..cc91d44 100644
--- a/nova/files/pike/qemu.conf.Debian
+++ b/nova/files/pike/qemu.conf.Debian
@@ -248,7 +248,7 @@
{%- endif %}
{%- if compute.qemu.dynamic_ownership is defined %}
-dynamic_ownership = "{{ compute.qemu.dynamic_ownership }}"
+dynamic_ownership = {{ compute.qemu.dynamic_ownership|int }}
{%- endif %}
{%- endif %}
diff --git a/nova/files/queens/nova-compute.conf.Debian b/nova/files/queens/nova-compute.conf.Debian
index e73c24f..9ee6a0e 100644
--- a/nova/files/queens/nova-compute.conf.Debian
+++ b/nova/files/queens/nova-compute.conf.Debian
@@ -7258,19 +7258,19 @@
# What I/O schedule class and priority level should be used when clearing
# a volume. Only takes effect if ``volume_clear`` option is set to ``zero`` or
# ``shred``. For more info about classes and priorities, check ``man ionice``.
-#
+#
# Possible values:
-#
+#
# * idle - use the Idle scheduling class. This option impacts system performance
# the least with a downside of increased time for volume clearance
# * from 0 to 7 - use the Best-effort scheduling class and set the priority level
# to the specified number
-#
+#
# If not set - do not set I/O scheduling class explicitly. Usually, it's the most
# aggressive option in terms of system performance impact.
-#
+#
# Related options:
-#
+#
# * images_type - must be set to ``lvm``
# * volume_clear - must be set and the value must be different than ``none``
# for this option to have any impact
diff --git a/nova/files/queens/qemu.conf.Debian b/nova/files/queens/qemu.conf.Debian
index 3960007..403490f 100644
--- a/nova/files/queens/qemu.conf.Debian
+++ b/nova/files/queens/qemu.conf.Debian
@@ -252,7 +252,7 @@
{%- endif %}
{%- if compute.qemu.dynamic_ownership is defined %}
-dynamic_ownership = "{{ compute.qemu.dynamic_ownership }}"
+dynamic_ownership = {{ compute.qemu.dynamic_ownership|int }}
{%- endif %}
{%- endif %}