From 42893457b15aced6a088a7e48b766d1620b0f169 Mon Sep 17 00:00:00 2001
From: Marcus Boden <marcus.boden@canonical.com>
Date: Thu, 17 Nov 2022 11:38:42 +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: Ia8d62de27ce59278722c58a2328b0301f461adbb
---
 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 ++++---
 12 files changed, 49 insertions(+), 36 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 30691a89..517e2b4b 100644
--- a/templates/kilo/nova.conf
+++ b/templates/kilo/nova.conf
@@ -130,6 +130,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 }}
@@ -192,9 +197,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 65278a7d..9d754f8d 100644
--- a/templates/liberty/nova.conf
+++ b/templates/liberty/nova.conf
@@ -144,6 +144,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 }}
@@ -206,9 +210,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 b5882395..86f4eaf2 100644
--- a/templates/mitaka/nova.conf
+++ b/templates/mitaka/nova.conf
@@ -132,6 +132,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
@@ -225,9 +229,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 cd2ff138..5c0347ae 100644
--- a/templates/newton/nova.conf
+++ b/templates/newton/nova.conf
@@ -137,6 +137,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
@@ -248,9 +252,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 25468138..21dc679c 100644
--- a/templates/ocata/nova.conf
+++ b/templates/ocata/nova.conf
@@ -140,6 +140,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/pike/nova.conf b/templates/pike/nova.conf
index 87c086a0..fd61ccb3 100644
--- a/templates/pike/nova.conf
+++ b/templates/pike/nova.conf
@@ -126,6 +126,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
@@ -256,9 +260,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 f85da07d..03e5359c 100644
--- a/templates/queens/nova.conf
+++ b/templates/queens/nova.conf
@@ -132,6 +132,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
@@ -277,9 +281,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 ad0abea2..9a26e3a8 100644
--- a/templates/rocky/nova.conf
+++ b/templates/rocky/nova.conf
@@ -132,6 +132,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
@@ -295,9 +299,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 0f7fa2a3..9d6e6a4e 100644
--- a/templates/stein/nova.conf
+++ b/templates/stein/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 %}
+
 [vnc]
 {% if console_vnc_type -%}
 enabled = True
@@ -309,9 +313,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 fbff919a..91074692 100644
--- a/templates/train/nova.conf
+++ b/templates/train/nova.conf
@@ -173,6 +173,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 %}
+
 [pci]
 {% if pci_passthrough_whitelist -%}
 passthrough_whitelist = {{ pci_passthrough_whitelist }}
@@ -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 }}