openstack/puppet-ironic
Code Issues Proposed changes

pxe: Fix wrong anchors

Browse Source 
We should use the ironic anchor instead of the ironic-inspector
anchor to ensure that the ironic user/group is already created.

Change-Id: Ie744cd8afd534a2703b6e3fe15cb25ffb07c3708
This commit is contained in:
Takashi Kajinami 2024-10-14 02:18:48 +09:00
parent 7835a23bab
commit 66dd8e4589
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/pxe.pp
View File

@ -259,7 +259,7 @@ class ironic::pxe (
ironic::pxe::tftpboot_file { 'pxelinux.0':
source_directory => $pxelinux_path,
destination_directory => $tftp_root_real,
require => Anchor['ironic-inspector::install::end'],
require => Anchor['ironic::install::end'],
}
}
@ -273,7 +273,7 @@ class ironic::pxe (
ironic::pxe::tftpboot_file { $syslinux_files:
source_directory => $syslinux_path,
destination_directory => $tftp_root_real,
require => Anchor['ironic-inspector::install::end'],
require => Anchor['ironic::install::end'],
}
}
@ -292,7 +292,7 @@ class ironic::pxe (
source => "${::ironic::params::ipxe_rom_dir}/undionly.kpxe",
backup => false,
show_diff => false,
require => Anchor['ironic-inspector::install::end'],
require => Anchor['ironic::install::end'],
tag => 'ironic-tftp-file',
}
@ -305,7 +305,7 @@ class ironic::pxe (
source => "${::ironic::params::ipxe_rom_dir}/${ipxe_name_base}${arch}.efi",
backup => false,
show_diff => false,
require => Anchor['ironic-inspector::install::end'],
require => Anchor['ironic::install::end'],
tag => 'ironic-tftp-file',
}
@ -324,7 +324,7 @@ class ironic::pxe (
source => "${::ironic::params::grub_efi_file}",
backup => false,
show_diff => false,
require => Anchor['ironic-inspector::install::end'],
require => Anchor['ironic::install::end'],
tag => 'ironic-tftp-file',
}
@ -343,7 +343,7 @@ class ironic::pxe (
source => "${::ironic::params::shim_file}",
backup => false,
show_diff => false,
require => Anchor['ironic-inspector::install::end'],
require => Anchor['ironic::install::end'],
tag => 'ironic-tftp-file',
}

16
spec/classes/ironic_pxe_spec.rb
View File

@ -57,7 +57,7 @@ describe 'ironic::pxe' do
is_expected.to contain_file('/tftpboot/undionly.kpxe').with(
'owner' => 'ironic',
'group' => 'ironic',
'require' => 'Anchor[ironic-inspector::install::end]',
'require' => 'Anchor[ironic::install::end]',
'seltype' => 'tftpdir_t',
'ensure' => 'file',
'show_diff' => false,
@ -68,7 +68,7 @@ describe 'ironic::pxe' do
is_expected.to contain_file("/tftpboot/#{platform_params[:uefi_ipxe_bootfile_name]}").with(
'owner' => 'ironic',
'group' => 'ironic',
'require' => 'Anchor[ironic-inspector::install::end]',
'require' => 'Anchor[ironic::install::end]',
'seltype' => 'tftpdir_t',
'ensure' => 'file',
'show_diff' => false,
@ -87,7 +87,7 @@ describe 'ironic::pxe' do
is_expected.to contain_file('/tftpboot/bootx64.efi').with(
'owner' => 'ironic',
'group' => 'ironic',
'require' => 'Anchor[ironic-inspector::install::end]',
'require' => 'Anchor[ironic::install::end]',
'seltype' => 'tftpdir_t',
'ensure' => 'file',
'show_diff' => false,
@ -105,7 +105,7 @@ describe 'ironic::pxe' do
is_expected.to contain_file('/tftpboot/grubx64.efi').with(
'owner' => 'ironic',
'group' => 'ironic',
'require' => 'Anchor[ironic-inspector::install::end]',
'require' => 'Anchor[ironic::install::end]',
'seltype' => 'tftpdir_t',
'ensure' => 'file',
'show_diff' => false,
@ -162,7 +162,7 @@ describe 'ironic::pxe' do
is_expected.to contain_file('/var/lib/tftpboot/undionly.kpxe').with(
'owner' => 'ironic',
'group' => 'ironic',
'require' => 'Anchor[ironic-inspector::install::end]',
'require' => 'Anchor[ironic::install::end]',
'seltype' => 'tftpdir_t',
'ensure' => 'file',
'show_diff' => false,
@ -173,7 +173,7 @@ describe 'ironic::pxe' do
is_expected.to contain_file("/var/lib/tftpboot/#{platform_params[:uefi_ipxe_bootfile_name]}").with(
'owner' => 'ironic',
'group' => 'ironic',
'require' => 'Anchor[ironic-inspector::install::end]',
'require' => 'Anchor[ironic::install::end]',
'seltype' => 'tftpdir_t',
'ensure' => 'file',
'show_diff' => false,
@ -185,7 +185,7 @@ describe 'ironic::pxe' do
is_expected.to contain_file('/var/lib/tftpboot/bootx64.efi').with(
'owner' => 'ironic',
'group' => 'ironic',
'require' => 'Anchor[ironic-inspector::install::end]',
'require' => 'Anchor[ironic::install::end]',
'seltype' => 'tftpdir_t',
'ensure' => 'file',
'show_diff' => false,
@ -196,7 +196,7 @@ describe 'ironic::pxe' do
is_expected.to contain_file('/var/lib/tftpboot/grubx64.efi').with(
'owner' => 'ironic',
'group' => 'ironic',
'require' => 'Anchor[ironic-inspector::install::end]',
'require' => 'Anchor[ironic::install::end]',
'seltype' => 'tftpdir_t',
'ensure' => 'file',
'show_diff' => false,