From f63900b54917f6b1d6fe342f89786b9346a5ee93 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 10 Jun 2024 17:42:33 +0900
Subject: [PATCH] Drop redundant package name checks

ironic-api package and ironic-conductor package are defined for all
supported operating systems, thus these checks are just redundant.

Change-Id: I195a377e22d09aa0ee619f46e07e351dd3b87d35
---
 manifests/api.pp       | 10 ++++------
 manifests/conductor.pp | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/manifests/api.pp b/manifests/api.pp
index 50edd634..9dee6cce 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -102,12 +102,10 @@ class ironic::api (
   }
 
   # Install package
-  if $::ironic::params::api_package {
-    package { 'ironic-api':
-      ensure => $package_ensure,
-      name   => $::ironic::params::api_package,
-      tag    => ['openstack', 'ironic-package'],
-    }
+  package { 'ironic-api':
+    ensure => $package_ensure,
+    name   => $::ironic::params::api_package,
+    tag    => ['openstack', 'ironic-package'],
   }
 
   if $manage_service {
diff --git a/manifests/conductor.pp b/manifests/conductor.pp
index 17794aee..0e7c602e 100644
--- a/manifests/conductor.pp
+++ b/manifests/conductor.pp
@@ -375,12 +375,10 @@ class ironic::conductor (
   }
 
   # Install package
-  if $::ironic::params::conductor_package {
-    package { 'ironic-conductor':
-      ensure => $package_ensure,
-      name   => $::ironic::params::conductor_package,
-      tag    => ['openstack', 'ironic-package'],
-    }
+  package { 'ironic-conductor':
+    ensure => $package_ensure,
+    name   => $::ironic::params::conductor_package,
+    tag    => ['openstack', 'ironic-package'],
   }
 
   if $manage_service {