openstack/puppet-ironic
Code Issues Proposed changes

Merge "Get rid of unnecessary ensure_resource"

Browse Source
This commit is contained in:
Zuul
2022-08-01 09:24:23 +00:00
committed by Gerrit Code Review
parent 36a824202e f018d2aade
commit df93450262
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/pxe.pp
View File

@@ -119,6 +119,8 @@ class ironic::pxe (
before => Anchor['ironic::config::end'], 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_resource( 'package', 'ironic-common', {
ensure => $package_ensure, ensure => $package_ensure,
name => $::ironic::params::common_package_name, name => $::ironic::params::common_package_name,
@@ -148,11 +150,11 @@ class ironic::pxe (
fail('xinetd is not available in this distro. Please use tftp_use_xinetd=false') fail('xinetd is not available in this distro. Please use tftp_use_xinetd=false')
} }
ensure_resource( 'package', 'tftp-server', { package { 'tftp-server':
'ensure' => $package_ensure, ensure => $package_ensure,
'name' => $::ironic::params::tftpd_package, name => $::ironic::params::tftpd_package,
'tag' => ['openstack', 'ironic-ipxe', 'ironic-support-package'], tag => ['openstack', 'ironic-ipxe', 'ironic-support-package'],
}) }
$options = "--map-file ${tftp_root_real}/map-file" $options = "--map-file ${tftp_root_real}/map-file"
@@ -233,11 +235,11 @@ class ironic::pxe (
} }
if $syslinux_path { if $syslinux_path {
ensure_resource( 'package', 'syslinux', { package { 'syslinux':
ensure => $package_ensure, ensure => $package_ensure,
name => $::ironic::params::syslinux_package, name => $::ironic::params::syslinux_package,
tag => ['openstack', 'ironic-ipxe', 'ironic-support-package'], tag => ['openstack', 'ironic-ipxe', 'ironic-support-package'],
}) }
ironic::pxe::tftpboot_file { $syslinux_files: ironic::pxe::tftpboot_file { $syslinux_files:
source_directory => $syslinux_path, source_directory => $syslinux_path,
@@ -246,11 +248,11 @@ class ironic::pxe (
} }
} }
ensure_resource( 'package', 'ipxe', { package { 'ipxe':
ensure => $package_ensure, ensure => $package_ensure,
name => $::ironic::params::ipxe_package, name => $::ironic::params::ipxe_package,
tag => ['openstack', 'ironic-ipxe', 'ironic-support-package'], tag => ['openstack', 'ironic-ipxe', 'ironic-support-package'],
}) }
file { "${tftp_root_real}/undionly.kpxe": file { "${tftp_root_real}/undionly.kpxe":
ensure => 'file', ensure => 'file',