From 610ae05f9127b8c73e86f20dbff9ca0cd7e019e8 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 21 Nov 2022 17:50:50 +0900
Subject: [PATCH] Remove logic for CentOS < 9

... because RDO supports CentOS Stream 9 (aka CentOS 9) only since Zed.

Change-Id: I0ff6eb5da73d1be6fd8e5f1c8127f9b18116c7b9
---
 manifests/params.pp               |  9 ++-------
 spec/classes/nova_compute_spec.rb | 19 +++----------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 40756f3a3..57fd6758a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -59,13 +59,8 @@ class nova::params {
       $nova_api_wsgi_script_source       = '/usr/bin/nova-api-wsgi'
       $nova_metadata_wsgi_script_source  = '/usr/bin/nova-metadata-wsgi'
       $messagebus_service_name           = 'dbus'
-      if versioncmp($::operatingsystemmajrelease, '9') >= 0 {
-        $mkisofs_package_name            = 'xorriso'
-        $mkisofs_cmd                     = 'mkisofs'
-      } else {
-        $mkisofs_package_name            = 'genisoimage'
-        $mkisofs_cmd                     = false
-      }
+      $mkisofs_package_name              = 'xorriso'
+      $mkisofs_cmd                       = 'mkisofs'
     }
     'Debian': {
       # package names
diff --git a/spec/classes/nova_compute_spec.rb b/spec/classes/nova_compute_spec.rb
index a5418c89e..c740e07d6 100644
--- a/spec/classes/nova_compute_spec.rb
+++ b/spec/classes/nova_compute_spec.rb
@@ -369,24 +369,11 @@ describe 'nova::compute' do
         let (:platform_params) do
           {
             :nova_compute_package => 'openstack-nova-compute',
-            :nova_compute_service => 'openstack-nova-compute'
+            :nova_compute_service => 'openstack-nova-compute',
+            :mkisofs_package      => 'xorriso',
+            :mkisofs_cmd          => 'mkisofs'
           }
         end
-        if facts[:operatingsystemmajrelease].to_i >= 9
-          before do
-            platform_params.merge!({
-              :mkisofs_package => 'xorriso',
-              :mkisofs_cmd     => 'mkisofs'
-            })
-          end
-        else
-          before do
-            platform_params.merge!({
-              :mkisofs_package => 'genisoimage',
-              :mkisofs_cmd     => '<SERVICE DEFAULT>'
-            })
-          end
-        end
       end
       it_behaves_like 'nova-compute'
     end