openstack/puppet-ironic
Code Issues Proposed changes

Merge "Ensure tftp root directory is created"

Browse Source
This commit is contained in:
Zuul
2021-08-23 17:18:36 +00:00
committed by Gerrit Code Review
parent 9e2422cc4e 0112497161
commit e4cc88ec8d
1 changed files with 12 additions and 5 deletions
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', owner => 'ironic',
group => 'ironic', group => 'ironic',
require => Anchor['ironic::install::end'], require => Anchor['ironic::install::end'],
tag => 'ironic-tftp-file',
} }
if $enable_ppc64le { if $enable_ppc64le {
file { "${tftp_root_real}/ppc64le": file { "${tftp_root_real}/ppc64le":
ensure => 'directory', ensure => 'directory',
seltype => 'tftpdir_t', seltype => 'tftpdir_t',
owner => 'ironic', owner => 'ironic',
group => 'ironic', group => 'ironic',
require => Anchor['ironic::install::end'], require => Anchor['ironic::install::end'],
tag => 'ironic-tftp-file',
} }
} }
@@ -155,6 +157,7 @@ class ironic::pxe (
file { "${tftp_root_real}/map-file": file { "${tftp_root_real}/map-file":
ensure => 'present', ensure => 'present',
content => "r ^([^/]) ${tftp_root_real}/\\1", content => "r ^([^/]) ${tftp_root_real}/\\1",
tag => 'ironic-tftp-file',
} }
if $syslinux_path { if $syslinux_path {
@@ -186,6 +189,7 @@ class ironic::pxe (
source => "${::ironic::params::ipxe_rom_dir}/undionly.kpxe", source => "${::ironic::params::ipxe_rom_dir}/undionly.kpxe",
backup => false, backup => false,
require => Anchor['ironic-inspector::install::end'], require => Anchor['ironic-inspector::install::end'],
tag => 'ironic-tftp-file',
} }
file { "${tftp_root_real}/${uefi_ipxe_bootfile_name}": 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", source => "${::ironic::params::ipxe_rom_dir}/${ipxe_name_base}${arch}.efi",
backup => false, backup => false,
require => Anchor['ironic-inspector::install::end'], require => Anchor['ironic-inspector::install::end'],
tag => 'ironic-tftp-file',
} }
File["${tftp_root_real}"] -> File<| tag == 'ironic-tftp-file' |>
include apache include apache
apache::vhost { 'ipxe_vhost': apache::vhost { 'ipxe_vhost':