From e799ba9d1975aa9b97525e528e981dcb8a93bb80 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Wed, 22 Nov 2023 01:48:49 +0900
Subject: [PATCH] Drop override of [DEFAULT] mkisofs_cmd in CentOS

The appropriate default value is added to the -dist.conf file[1], so
we no longer have to override the option.

[1] https://review.rdoproject.org/r/c/openstack/nova-distgit/+/50687

Change-Id: I51c5d5137795739d327b3d2aab751e716c70d686
---
 manifests/compute.pp              | 13 +------------
 manifests/params.pp               |  2 --
 spec/classes/nova_compute_spec.rb |  4 +---
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/manifests/compute.pp b/manifests/compute.pp
index cb64ce3f5..5777fb729 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -370,20 +370,9 @@ class nova::compute (
 
   include nova::availability_zone
 
-  # NOTE(tkajinam): In some distros like CentOS9, the genisoimage command
-  #                 is no longer available and we should override
-  #                 the mkisofs_cmd parameter to use the available command
-  #                 instead of genisoimage. This can be removed once default
-  #                 in nova is updated.
-  if $::nova::params::mkisofs_cmd and is_service_default($mkisofs_cmd) {
-    $mkisofs_cmd_real = $::nova::params::mkisofs_cmd
-  } else {
-    $mkisofs_cmd_real = $mkisofs_cmd
-  }
-
   nova_config {
     'DEFAULT/use_cow_images':                    value => $use_cow_images;
-    'DEFAULT/mkisofs_cmd':                       value => $mkisofs_cmd_real;
+    'DEFAULT/mkisofs_cmd':                       value => $mkisofs_cmd;
     'DEFAULT/force_raw_images':                  value => $force_raw_images;
     'DEFAULT/virt_mkfs':                         value => $virt_mkfs;
     'DEFAULT/reserved_host_cpus':                value => $reserved_host_cpus;
diff --git a/manifests/params.pp b/manifests/params.pp
index 587eb599c..60827eba1 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -33,7 +33,6 @@ class nova::params {
       $serialproxy_package_name          = 'openstack-nova-serialproxy'
       $spicehtml5proxy_package_name      = 'openstack-nova-console'
       $ceph_client_package_name          = 'ceph-common'
-      $mkisofs_cmd                       = 'mkisofs'
       $ovmf_package_name                 = 'edk2-ovmf'
       $swtpm_package_name                = 'swtpm'
       # service names
@@ -82,7 +81,6 @@ class nova::params {
       $scheduler_package_name            = 'nova-scheduler'
       $tgt_package_name                  = 'tgt'
       $ceph_client_package_name          = 'ceph-common'
-      $mkisofs_cmd                       = undef
       $ovmf_package_name                 = 'ovmf'
       $swtpm_package_name                = 'swtpm'
       # service names
diff --git a/spec/classes/nova_compute_spec.rb b/spec/classes/nova_compute_spec.rb
index 4c045af53..ae8bfa100 100644
--- a/spec/classes/nova_compute_spec.rb
+++ b/spec/classes/nova_compute_spec.rb
@@ -35,7 +35,7 @@ describe 'nova::compute' do
       end
 
       it { is_expected.to contain_nova_config('DEFAULT/use_cow_images').with_value('<SERVICE DEFAULT>') }
-      it { is_expected.to contain_nova_config('DEFAULT/mkisofs_cmd').with_value(platform_params[:mkisofs_cmd]) }
+      it { is_expected.to contain_nova_config('DEFAULT/mkisofs_cmd').with_value('<SERVICE DEFAULT>') }
       it { is_expected.to contain_nova_config('DEFAULT/force_raw_images').with_value('<SERVICE DEFAULT>') }
       it { is_expected.to contain_nova_config('DEFAULT/virt_mkfs').with_value('<SERVICE DEFAULT>') }
       it { is_expected.to contain_nova_config('DEFAULT/reserved_host_cpus').with_value('<SERVICE DEFAULT>') }
@@ -340,7 +340,6 @@ describe 'nova::compute' do
           {
             :nova_compute_package => 'nova-compute',
             :nova_compute_service => 'nova-compute',
-            :mkisofs_cmd          => '<SERVICE DEFAULT>'
           }
         end
       when 'RedHat'
@@ -348,7 +347,6 @@ describe 'nova::compute' do
           {
             :nova_compute_package => 'openstack-nova-compute',
             :nova_compute_service => 'openstack-nova-compute',
-            :mkisofs_cmd          => 'mkisofs'
           }
         end
       end