diff --git a/manifests/pxe.pp b/manifests/pxe.pp index d33fb972..04c060ed 100644 --- a/manifests/pxe.pp +++ b/manifests/pxe.pp @@ -221,27 +221,29 @@ class ironic::pxe ( }) file { "${tftp_root_real}/undionly.kpxe": - ensure => 'file', - seltype => 'tftpdir_t', - owner => $::ironic::params::user, - group => $::ironic::params::group, - mode => '0744', - source => "${::ironic::params::ipxe_rom_dir}/undionly.kpxe", - backup => false, - require => Anchor['ironic-inspector::install::end'], - tag => 'ironic-tftp-file', + ensure => 'file', + seltype => 'tftpdir_t', + owner => $::ironic::params::user, + group => $::ironic::params::group, + mode => '0744', + source => "${::ironic::params::ipxe_rom_dir}/undionly.kpxe", + backup => false, + show_diff => false, + require => Anchor['ironic-inspector::install::end'], + tag => 'ironic-tftp-file', } file { "${tftp_root_real}/${uefi_ipxe_bootfile_name_real}": - ensure => 'file', - seltype => 'tftpdir_t', - owner => $::ironic::params::user, - group => $::ironic::params::group, - mode => '0744', - source => "${::ironic::params::ipxe_rom_dir}/${ipxe_name_base}${arch}.efi", - backup => false, - require => Anchor['ironic-inspector::install::end'], - tag => 'ironic-tftp-file', + ensure => 'file', + seltype => 'tftpdir_t', + owner => $::ironic::params::user, + group => $::ironic::params::group, + mode => '0744', + source => "${::ironic::params::ipxe_rom_dir}/${ipxe_name_base}${arch}.efi", + backup => false, + show_diff => false, + require => Anchor['ironic-inspector::install::end'], + tag => 'ironic-tftp-file', } File["${tftp_root_real}"] -> File<| tag == 'ironic-tftp-file' |> diff --git a/spec/classes/ironic_pxe_spec.rb b/spec/classes/ironic_pxe_spec.rb index d59174c4..7e81d5b7 100644 --- a/spec/classes/ironic_pxe_spec.rb +++ b/spec/classes/ironic_pxe_spec.rb @@ -55,22 +55,24 @@ describe 'ironic::pxe' do it 'should contain iPXE chainload images' do is_expected.to contain_file('/tftpboot/undionly.kpxe').with( - 'owner' => 'ironic', - 'group' => 'ironic', - 'require' => 'Anchor[ironic-inspector::install::end]', - 'seltype' => 'tftpdir_t', - 'ensure' => 'file', - 'backup' => false, + 'owner' => 'ironic', + 'group' => 'ironic', + 'require' => 'Anchor[ironic-inspector::install::end]', + 'seltype' => 'tftpdir_t', + 'ensure' => 'file', + 'show_diff' => false, + 'backup' => false, ) end it 'should contain iPXE UEFI chainload image' do is_expected.to contain_file('/tftpboot/snponly.efi').with( - 'owner' => 'ironic', - 'group' => 'ironic', - 'require' => 'Anchor[ironic-inspector::install::end]', - 'seltype' => 'tftpdir_t', - 'ensure' => 'file', - 'backup' => false, + 'owner' => 'ironic', + 'group' => 'ironic', + 'require' => 'Anchor[ironic-inspector::install::end]', + 'seltype' => 'tftpdir_t', + 'ensure' => 'file', + 'show_diff' => false, + 'backup' => false, ) end @@ -106,22 +108,24 @@ describe 'ironic::pxe' do it 'should contain iPXE chainload images' do is_expected.to contain_file('/var/lib/tftpboot/undionly.kpxe').with( - 'owner' => 'ironic', - 'group' => 'ironic', - 'require' => 'Anchor[ironic-inspector::install::end]', - 'seltype' => 'tftpdir_t', - 'ensure' => 'file', - 'backup' => false, + 'owner' => 'ironic', + 'group' => 'ironic', + 'require' => 'Anchor[ironic-inspector::install::end]', + 'seltype' => 'tftpdir_t', + 'ensure' => 'file', + 'show_diff' => false, + 'backup' => false, ) end it 'should contain iPXE UEFI chainload image' do is_expected.to contain_file('/var/lib/tftpboot/snponly.efi').with( - 'owner' => 'ironic', - 'group' => 'ironic', - 'require' => 'Anchor[ironic-inspector::install::end]', - 'seltype' => 'tftpdir_t', - 'ensure' => 'file', - 'backup' => false, + 'owner' => 'ironic', + 'group' => 'ironic', + 'require' => 'Anchor[ironic-inspector::install::end]', + 'seltype' => 'tftpdir_t', + 'ensure' => 'file', + 'show_diff' => false, + 'backup' => false, ) end end