From 4cb723cab2340d1ea7a188a3e69dc15a4540e9bb Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 11 Jan 2023 17:22:52 +0900
Subject: [PATCH] Make sure some options in qemu.conf are reset

... to make sure we do not leave the old configuration in the file.

Change-Id: Ia9b47cc7917d30cb534d07ac6e170f2fb7f54098
---
 manifests/compute/libvirt/qemu.pp              |  6 +++---
 spec/classes/nova_compute_libvirt_qemu_spec.rb | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/manifests/compute/libvirt/qemu.pp b/manifests/compute/libvirt/qemu.pp
index 38d44c88e..e8fb0201d 100644
--- a/manifests/compute/libvirt/qemu.pp
+++ b/manifests/compute/libvirt/qemu.pp
@@ -103,12 +103,12 @@ class nova::compute::libvirt::qemu(
     if $group and !empty($group) {
       $augues_group_changes = ["set group ${group}"]
     } else {
-      $augues_group_changes = []
+      $augues_group_changes = ['rm group']
     }
     if $memory_backing_dir and !empty($memory_backing_dir) {
       $augues_memory_backing_dir_changes = ["set memory_backing_dir ${memory_backing_dir}"]
     } else {
-      $augues_memory_backing_dir_changes = []
+      $augues_memory_backing_dir_changes = ['rm memory_backing_dir']
     }
     $augues_nbd_tls_changes = ["set nbd_tls ${nbd_tls_value}"]
 
@@ -124,10 +124,10 @@ class nova::compute::libvirt::qemu(
     $augues_changes = [
       'rm max_files',
       'rm max_processes',
-      'rm group',
       'rm vnc_tls',
       'rm vnc_tls_x509_verify',
       'rm default_tls_x509_verify',
+      'rm group',
       'rm memory_backing_dir',
       'rm nbd_tls',
     ]
diff --git a/spec/classes/nova_compute_libvirt_qemu_spec.rb b/spec/classes/nova_compute_libvirt_qemu_spec.rb
index a436a1618..81f8afcf5 100644
--- a/spec/classes/nova_compute_libvirt_qemu_spec.rb
+++ b/spec/classes/nova_compute_libvirt_qemu_spec.rb
@@ -15,10 +15,10 @@ describe 'nova::compute::libvirt::qemu' do
         :changes => [
             "rm max_files",
             "rm max_processes",
-            "rm group",
             "rm vnc_tls",
             "rm vnc_tls_x509_verify",
             "rm default_tls_x509_verify",
+            "rm group",
             "rm memory_backing_dir",
             "rm nbd_tls",
         ],
@@ -39,6 +39,8 @@ describe 'nova::compute::libvirt::qemu' do
             "set vnc_tls 0",
             "set vnc_tls_x509_verify 0",
             "set default_tls_x509_verify 1",
+            "rm group",
+            "rm memory_backing_dir",
             "set nbd_tls 0",
         ],
         :tag     => 'qemu-conf-augeas',
@@ -61,6 +63,8 @@ describe 'nova::compute::libvirt::qemu' do
             "set vnc_tls 0",
             "set vnc_tls_x509_verify 0",
             "set default_tls_x509_verify 1",
+            "rm group",
+            "rm memory_backing_dir",
             "set nbd_tls 0",
         ],
         :tag     => 'qemu-conf-augeas',
@@ -108,6 +112,8 @@ describe 'nova::compute::libvirt::qemu' do
             "set vnc_tls 1",
             "set vnc_tls_x509_verify 1",
             "set default_tls_x509_verify 1",
+            "rm group",
+            "rm memory_backing_dir",
             "set nbd_tls 0",
         ],
         :tag     => 'qemu-conf-augeas',
@@ -129,6 +135,8 @@ describe 'nova::compute::libvirt::qemu' do
             "set vnc_tls 0",
             "set vnc_tls_x509_verify 0",
             "set default_tls_x509_verify 1",
+            "rm group",
+            "rm memory_backing_dir",
             "set nbd_tls 0",
         ],
         :tag     => 'qemu-conf-augeas',
@@ -151,6 +159,8 @@ describe 'nova::compute::libvirt::qemu' do
             "set vnc_tls 1",
             "set vnc_tls_x509_verify 0",
             "set default_tls_x509_verify 1",
+            "rm group",
+            "rm memory_backing_dir",
             "set nbd_tls 0",
         ],
         :tag     => 'qemu-conf-augeas',
@@ -172,6 +182,8 @@ describe 'nova::compute::libvirt::qemu' do
             "set vnc_tls 0",
             "set vnc_tls_x509_verify 0",
             "set default_tls_x509_verify 0",
+            "rm group",
+            "rm memory_backing_dir",
             "set nbd_tls 0",
         ],
         :tag     => 'qemu-conf-augeas',
@@ -193,6 +205,8 @@ describe 'nova::compute::libvirt::qemu' do
             "set vnc_tls 0",
             "set vnc_tls_x509_verify 0",
             "set default_tls_x509_verify 1",
+            "rm group",
+            "rm memory_backing_dir",
             "set nbd_tls 1",
         ],
         :tag     => 'qemu-conf-augeas',