From a3da54fb4156fa93ea89baefa47c2032edb9423e Mon Sep 17 00:00:00 2001
From: Marcus Boden <marcus.boden@canonical.com>
Date: Wed, 16 Nov 2022 08:25:01 +0100
Subject: [PATCH] Move default_ephemeral_format to [DEFAULT] section

The default_ephemeral_format line in nova.conf was not in the [DEFAULT]
section in the templates and has therefore been ignored ny nova-compute.
This change moves it to the correct section for all releases.

Closes-Bug: #1992386
Change-Id: Idc0602f95e5378be1243926aa88dc7b5282ee844
---
 templates/icehouse/nova.conf | 7 ++++---
 templates/juno/nova.conf     | 7 ++++---
 templates/kilo/nova.conf     | 8 +++++---
 templates/liberty/nova.conf  | 7 ++++---
 templates/mitaka/nova.conf   | 7 ++++---
 templates/newton/nova.conf   | 7 ++++---
 templates/ocata/nova.conf    | 7 ++++---
 templates/pike/nova.conf     | 7 ++++---
 templates/queens/nova.conf   | 7 ++++---
 templates/rocky/nova.conf    | 7 ++++---
 templates/stein/nova.conf    | 7 ++++---
 templates/train/nova.conf    | 7 ++++---
 templates/yoga/nova.conf     | 7 ++++---
 13 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/templates/icehouse/nova.conf b/templates/icehouse/nova.conf
index 8c1d0635..77789f2c 100644
--- a/templates/icehouse/nova.conf
+++ b/templates/icehouse/nova.conf
@@ -141,6 +141,10 @@ instances_path = {{ instances_path }}
 default_availability_zone = {{ default_availability_zone }}
 {% endif -%}
 
+{% if default_ephemeral_format -%}
+default_ephemeral_format = {{ default_ephemeral_format }}
+{% endif %}
+
 {% if console_access_protocol == 'spice' -%}
 [spice]
 agent_enabled = True
@@ -176,8 +180,5 @@ disk_cachemodes = {{ disk_cachemodes }}
 {% if use_multipath -%}
 iscsi_use_multipath = {{ use_multipath }}
 {% endif %}
-{% if default_ephemeral_format -%}
-default_ephemeral_format = {{ default_ephemeral_format }}
-{% endif %}
 
 {% include "parts/section-ephemeral" %}
diff --git a/templates/juno/nova.conf b/templates/juno/nova.conf
index 5e0c6bf4..a0c7bc35 100644
--- a/templates/juno/nova.conf
+++ b/templates/juno/nova.conf
@@ -133,6 +133,10 @@ instances_path = {{ instances_path }}
 default_availability_zone = {{ default_availability_zone }}
 {% endif -%}
 
+{% if default_ephemeral_format -%}
+default_ephemeral_format = {{ default_ephemeral_format }}
+{% endif %}
+
 {% if console_access_protocol == 'spice' -%}
 [spice]
 agent_enabled = True
@@ -171,9 +175,6 @@ disk_cachemodes = {{ disk_cachemodes }}
 {% if use_multipath -%}
 iscsi_use_multipath = {{ use_multipath }}
 {% endif %}
-{% if default_ephemeral_format -%}
-default_ephemeral_format = {{ default_ephemeral_format }}
-{% endif %}
 
 {% include "parts/section-cinder" %}
 
diff --git a/templates/kilo/nova.conf b/templates/kilo/nova.conf
index a3781adb..53b13cda 100644
--- a/templates/kilo/nova.conf
+++ b/templates/kilo/nova.conf
@@ -131,6 +131,11 @@ default_availability_zone = {{ default_availability_zone }}
 
 metadata_workers = {{ workers }}
 
+{% if default_ephemeral_format -%}
+default_ephemeral_format = {{ default_ephemeral_format }}
+{% endif %}
+
+
 {% if network_manager == 'neutron' and network_manager_config -%}
 [neutron]
 url = {{ network_manager_config.neutron_url }}
@@ -193,9 +198,6 @@ disk_cachemodes = {{ disk_cachemodes }}
 {% if use_multipath -%}
 iscsi_use_multipath = {{ use_multipath }}
 {% endif %}
-{% if default_ephemeral_format -%}
-default_ephemeral_format = {{ default_ephemeral_format }}
-{% endif %}
 
 {% include "parts/section-database" %}
 
diff --git a/templates/liberty/nova.conf b/templates/liberty/nova.conf
index 869d1b24..1361142e 100644
--- a/templates/liberty/nova.conf
+++ b/templates/liberty/nova.conf
@@ -145,6 +145,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
 disk_allocation_ratio = {{ disk_allocation_ratio }}
 {% endif -%}
 
+{% if default_ephemeral_format -%}
+default_ephemeral_format = {{ default_ephemeral_format }}
+{% endif %}
+
 {% if network_manager == 'neutron' and network_manager_config -%}
 [neutron]
 url = {{ network_manager_config.neutron_url }}
@@ -207,9 +211,6 @@ disk_cachemodes = {{ disk_cachemodes }}
 {% if use_multipath -%}
 iscsi_use_multipath = {{ use_multipath }}
 {% endif %}
-{% if default_ephemeral_format -%}
-default_ephemeral_format = {{ default_ephemeral_format }}
-{% endif %}
 
 {% include "parts/section-database" %}
 
diff --git a/templates/mitaka/nova.conf b/templates/mitaka/nova.conf
index 1491b1f9..cdf694ab 100644
--- a/templates/mitaka/nova.conf
+++ b/templates/mitaka/nova.conf
@@ -133,6 +133,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
 disk_allocation_ratio = {{ disk_allocation_ratio }}
 {% endif -%}
 
+{% if default_ephemeral_format -%}
+default_ephemeral_format = {{ default_ephemeral_format }}
+{% endif %}
+
 [vnc]
 {% if console_vnc_type -%}
 enabled = True
@@ -226,9 +230,6 @@ live_migration_tunnelled = False
 {% if use_multipath -%}
 iscsi_use_multipath = {{ use_multipath }}
 {% endif %}
-{% if default_ephemeral_format -%}
-default_ephemeral_format = {{ default_ephemeral_format }}
-{% endif %}
 hw_disk_discard = unmap
 
 {% if virt_type == 'lxd' -%}
diff --git a/templates/newton/nova.conf b/templates/newton/nova.conf
index 848cefa2..ba11e2f6 100644
--- a/templates/newton/nova.conf
+++ b/templates/newton/nova.conf
@@ -138,6 +138,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
 disk_allocation_ratio = {{ disk_allocation_ratio }}
 {% endif -%}
 
+{% if default_ephemeral_format -%}
+default_ephemeral_format = {{ default_ephemeral_format }}
+{% endif %}
+
 [vnc]
 {% if console_vnc_type -%}
 enabled = True
@@ -249,9 +253,6 @@ live_migration_tunnelled = False
 {% if use_multipath -%}
 volume_use_multipath = {{ use_multipath }}
 {% endif %}
-{% if default_ephemeral_format -%}
-default_ephemeral_format = {{ default_ephemeral_format }}
-{% endif %}
 hw_disk_discard = unmap
 
 {% if virt_type == 'lxd' -%}
diff --git a/templates/ocata/nova.conf b/templates/ocata/nova.conf
index f1eeabae..cbae842c 100644
--- a/templates/ocata/nova.conf
+++ b/templates/ocata/nova.conf
@@ -141,6 +141,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
 disk_allocation_ratio = {{ disk_allocation_ratio }}
 {% endif -%}
 
+{% if default_ephemeral_format -%}
+default_ephemeral_format = {{ default_ephemeral_format }}
+{% endif %}
+
 [vnc]
 {% if console_vnc_type -%}
 enabled = True
@@ -258,9 +262,6 @@ live_migration_tunnelled = False
 {% if use_multipath -%}
 volume_use_multipath = {{ use_multipath }}
 {% endif %}
-{% if default_ephemeral_format -%}
-default_ephemeral_format = {{ default_ephemeral_format }}
-{% endif %}
 hw_disk_discard = unmap
 
 {% if virt_type == 'lxd' -%}
diff --git a/templates/pike/nova.conf b/templates/pike/nova.conf
index 679a9430..eda66cdb 100644
--- a/templates/pike/nova.conf
+++ b/templates/pike/nova.conf
@@ -127,6 +127,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
 disk_allocation_ratio = {{ disk_allocation_ratio }}
 {% endif -%}
 
+{% if default_ephemeral_format -%}
+default_ephemeral_format = {{ default_ephemeral_format }}
+{% endif %}
+
 [vnc]
 {% if console_vnc_type -%}
 enabled = True
@@ -257,9 +261,6 @@ live_migration_tunnelled = False
 {% if use_multipath -%}
 volume_use_multipath = {{ use_multipath }}
 {% endif %}
-{% if default_ephemeral_format -%}
-default_ephemeral_format = {{ default_ephemeral_format }}
-{% endif %}
 hw_disk_discard = unmap
 
 {% if virt_type == 'lxd' -%}
diff --git a/templates/queens/nova.conf b/templates/queens/nova.conf
index 06372819..7393c655 100644
--- a/templates/queens/nova.conf
+++ b/templates/queens/nova.conf
@@ -139,6 +139,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
 disk_allocation_ratio = {{ disk_allocation_ratio }}
 {% endif -%}
 
+{% if default_ephemeral_format -%}
+default_ephemeral_format = {{ default_ephemeral_format }}
+{% endif %}
+
 [vnc]
 {% if console_vnc_type -%}
 enabled = True
@@ -284,9 +288,6 @@ live_migration_tunnelled = False
 {% if use_multipath -%}
 volume_use_multipath = {{ use_multipath }}
 {% endif %}
-{% if default_ephemeral_format -%}
-default_ephemeral_format = {{ default_ephemeral_format }}
-{% endif %}
 hw_disk_discard = unmap
 
 {% if virt_type == 'lxd' -%}
diff --git a/templates/rocky/nova.conf b/templates/rocky/nova.conf
index df8d4009..d074cfe7 100644
--- a/templates/rocky/nova.conf
+++ b/templates/rocky/nova.conf
@@ -139,6 +139,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
 disk_allocation_ratio = {{ disk_allocation_ratio }}
 {% endif -%}
 
+{% if default_ephemeral_format -%}
+default_ephemeral_format = {{ default_ephemeral_format }}
+{% endif %}
+
 [vnc]
 {% if console_vnc_type -%}
 enabled = True
@@ -302,9 +306,6 @@ live_migration_tunnelled = False
 {% if use_multipath -%}
 volume_use_multipath = {{ use_multipath }}
 {% endif %}
-{% if default_ephemeral_format -%}
-default_ephemeral_format = {{ default_ephemeral_format }}
-{% endif %}
 hw_disk_discard = unmap
 {% if virtio_net_tx_queue_size -%}
 tx_queue_size = {{ virtio_net_tx_queue_size }}
diff --git a/templates/stein/nova.conf b/templates/stein/nova.conf
index aabce112..5add5bc8 100644
--- a/templates/stein/nova.conf
+++ b/templates/stein/nova.conf
@@ -152,6 +152,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
 disk_allocation_ratio = {{ disk_allocation_ratio }}
 {% endif -%}
 
+{% if default_ephemeral_format -%}
+default_ephemeral_format = {{ default_ephemeral_format }}
+{% endif %}
+
 [vnc]
 {% if console_vnc_type -%}
 enabled = True
@@ -316,9 +320,6 @@ live_migration_tunnelled = False
 {% if use_multipath -%}
 volume_use_multipath = {{ use_multipath }}
 {% endif %}
-{% if default_ephemeral_format -%}
-default_ephemeral_format = {{ default_ephemeral_format }}
-{% endif %}
 hw_disk_discard = unmap
 {% if virtio_net_tx_queue_size -%}
 tx_queue_size = {{ virtio_net_tx_queue_size }}
diff --git a/templates/train/nova.conf b/templates/train/nova.conf
index e4ee3bbc..8ed7dda1 100644
--- a/templates/train/nova.conf
+++ b/templates/train/nova.conf
@@ -184,6 +184,10 @@ disk_allocation_ratio = {{ disk_allocation_ratio }}
 allow_resize_to_same_host = {{ allow_resize_to_same_host }}
 {% endif -%}
 
+{% if default_ephemeral_format -%}
+default_ephemeral_format = {{ default_ephemeral_format }}
+{% endif %}
+
 [pci]
 {% if pci_passthrough_whitelist -%}
 passthrough_whitelist = {{ pci_passthrough_whitelist }}
@@ -327,9 +331,6 @@ live_migration_tunnelled = False
 {% if use_multipath -%}
 volume_use_multipath = {{ use_multipath }}
 {% endif %}
-{% if default_ephemeral_format -%}
-default_ephemeral_format = {{ default_ephemeral_format }}
-{% endif %}
 hw_disk_discard = unmap
 {% if virtio_net_tx_queue_size -%}
 tx_queue_size = {{ virtio_net_tx_queue_size }}
diff --git a/templates/yoga/nova.conf b/templates/yoga/nova.conf
index 7cb38273..129a1663 100644
--- a/templates/yoga/nova.conf
+++ b/templates/yoga/nova.conf
@@ -167,6 +167,10 @@ disk_allocation_ratio = {{ disk_allocation_ratio }}
 allow_resize_to_same_host = {{ allow_resize_to_same_host }}
 {% endif -%}
 
+{% if default_ephemeral_format -%}
+default_ephemeral_format = {{ default_ephemeral_format }}
+{% endif %}
+
 [pci]
 {% if pci_passthrough_whitelist -%}
 passthrough_whitelist = {{ pci_passthrough_whitelist }}
@@ -310,9 +314,6 @@ live_migration_tunnelled = False
 {% if use_multipath -%}
 volume_use_multipath = {{ use_multipath }}
 {% endif %}
-{% if default_ephemeral_format -%}
-default_ephemeral_format = {{ default_ephemeral_format }}
-{% endif %}
 hw_disk_discard = unmap
 {% if virtio_net_tx_queue_size -%}
 tx_queue_size = {{ virtio_net_tx_queue_size }}