From f018d2aadebe4340a14d2cc1eb2163d398ee730a Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 2 Jun 2022 09:29:56 +0900
Subject: [PATCH] Get rid of unnecessary ensure_resource

ensure_resource or ensure_package is not required unless the package
is defined in multiple manifests. This removes unnecessary usage to
simplify resource definitions.

Change-Id: I4ebf80af631f1e33cca5c8c0525828a8152e290a
---
 manifests/pxe.pp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/manifests/pxe.pp b/manifests/pxe.pp
index 04c060ed..a06e48f4 100644
--- a/manifests/pxe.pp
+++ b/manifests/pxe.pp
@@ -105,6 +105,8 @@ class ironic::pxe (
     before  => Anchor['ironic::config::end'],
   }
 
+  # NOTE(tkajinam): ironic-common package is also installed by the base ironic
+  #                 class so here we need ensure_resource
   ensure_resource( 'package', 'ironic-common', {
     ensure => $package_ensure,
     name   => $::ironic::params::common_package_name,
@@ -134,11 +136,11 @@ class ironic::pxe (
       fail('xinetd is not available in this distro. Please use tftp_use_xinetd=false')
     }
 
-    ensure_resource( 'package', 'tftp-server', {
-      'ensure' => $package_ensure,
-      'name'   => $::ironic::params::tftpd_package,
-      'tag'    => ['openstack', 'ironic-ipxe', 'ironic-support-package'],
-    })
+    package { 'tftp-server':
+      ensure => $package_ensure,
+      name   => $::ironic::params::tftpd_package,
+      tag    => ['openstack', 'ironic-ipxe', 'ironic-support-package'],
+    }
 
     $options = "--map-file ${tftp_root_real}/map-file"
 
@@ -201,11 +203,11 @@ class ironic::pxe (
   }
 
   if $syslinux_path {
-    ensure_resource( 'package', 'syslinux', {
+    package { 'syslinux':
       ensure => $package_ensure,
       name   => $::ironic::params::syslinux_package,
       tag    => ['openstack', 'ironic-ipxe', 'ironic-support-package'],
-    })
+    }
 
     ironic::pxe::tftpboot_file { $syslinux_files:
       source_directory      => $syslinux_path,
@@ -214,11 +216,11 @@ class ironic::pxe (
     }
   }
 
-  ensure_resource( 'package', 'ipxe', {
+  package { 'ipxe':
     ensure => $package_ensure,
     name   => $::ironic::params::ipxe_package,
     tag    => ['openstack', 'ironic-ipxe', 'ironic-support-package'],
-  })
+  }
 
   file { "${tftp_root_real}/undionly.kpxe":
     ensure    => 'file',