openstack
/
puppet-ironic
Code Issues Proposed changes

Ensure tftp root directory is created 

... before creating any file under the directory.

Change-Id: I549d2217668d84f170b5c7a989c2acf2b9a0e16a
This commit is contained in:
Takashi Kajinami 2021-08-22 21:49:36 +09:00
parent 2dfba43f8a
commit 0112497161
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/pxe.pp
View File

@ -109,15 +109,17 @@ class ironic::pxe (
owner => 'ironic',
group => 'ironic',
require => Anchor['ironic::install::end'],
tag => 'ironic-tftp-file',
}
if $enable_ppc64le {
file { "${tftp_root_real}/ppc64le":
ensure => 'directory',
seltype => 'tftpdir_t',
owner => 'ironic',
group => 'ironic',
require => Anchor['ironic::install::end'],
ensure => 'directory',
seltype => 'tftpdir_t',
owner => 'ironic',
group => 'ironic',
require => Anchor['ironic::install::end'],
tag => 'ironic-tftp-file',
}
}
@ -155,6 +157,7 @@ class ironic::pxe (
file { "${tftp_root_real}/map-file":
ensure => 'present',
content => "r ^([^/]) ${tftp_root_real}/\\1",
tag => 'ironic-tftp-file',
}
if $syslinux_path {
@ -186,6 +189,7 @@ class ironic::pxe (
source => "${::ironic::params::ipxe_rom_dir}/undionly.kpxe",
backup => false,
require => Anchor['ironic-inspector::install::end'],
tag => 'ironic-tftp-file',
}
file { "${tftp_root_real}/${uefi_ipxe_bootfile_name}":
@ -197,8 +201,11 @@ class ironic::pxe (
source => "${::ironic::params::ipxe_rom_dir}/${ipxe_name_base}${arch}.efi",
backup => false,
require => Anchor['ironic-inspector::install::end'],
tag => 'ironic-tftp-file',
}
File["${tftp_root_real}"] -> File<| tag == 'ironic-tftp-file' |>
include apache
apache::vhost { 'ipxe_vhost':