openstack/puppet-ironic
Code Issues Proposed changes

Do not show diffs of image files

Browse Source 
... because these are binary files and diffs are not really useful.

Change-Id: Ife95969ab90bdba3d3af55e021b7bd6b76f94b2c
This commit is contained in:
Takashi Kajinami
2022-06-24 01:35:29 +09:00
parent 05ada3d17f
commit 8672adf57a
2 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
manifests/pxe.pp
View File

@@ -221,27 +221,29 @@ class ironic::pxe (
}) })
file { "${tftp_root_real}/undionly.kpxe": file { "${tftp_root_real}/undionly.kpxe":
ensure => 'file', ensure => 'file',
seltype => 'tftpdir_t', seltype => 'tftpdir_t',
owner => $::ironic::params::user, owner => $::ironic::params::user,
group => $::ironic::params::group, group => $::ironic::params::group,
mode => '0744', mode => '0744',
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'], show_diff => false,
tag => 'ironic-tftp-file', require => Anchor['ironic-inspector::install::end'],
tag => 'ironic-tftp-file',
} }
file { "${tftp_root_real}/${uefi_ipxe_bootfile_name_real}": file { "${tftp_root_real}/${uefi_ipxe_bootfile_name_real}":
ensure => 'file', ensure => 'file',
seltype => 'tftpdir_t', seltype => 'tftpdir_t',
owner => $::ironic::params::user, owner => $::ironic::params::user,
group => $::ironic::params::group, group => $::ironic::params::group,
mode => '0744', mode => '0744',
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'], show_diff => false,
tag => 'ironic-tftp-file', require => Anchor['ironic-inspector::install::end'],
tag => 'ironic-tftp-file',
} }
File["${tftp_root_real}"] -> File<| tag == 'ironic-tftp-file' |> File["${tftp_root_real}"] -> File<| tag == 'ironic-tftp-file' |>

52
spec/classes/ironic_pxe_spec.rb
View File

@@ -55,22 +55,24 @@ describe 'ironic::pxe' do
it 'should contain iPXE chainload images' do it 'should contain iPXE chainload images' do
is_expected.to contain_file('/tftpboot/undionly.kpxe').with( is_expected.to contain_file('/tftpboot/undionly.kpxe').with(
'owner' => 'ironic', 'owner' => 'ironic',
'group' => 'ironic', 'group' => 'ironic',
'require' => 'Anchor[ironic-inspector::install::end]', 'require' => 'Anchor[ironic-inspector::install::end]',
'seltype' => 'tftpdir_t', 'seltype' => 'tftpdir_t',
'ensure' => 'file', 'ensure' => 'file',
'backup' => false, 'show_diff' => false,
'backup' => false,
) )
end end
it 'should contain iPXE UEFI chainload image' do it 'should contain iPXE UEFI chainload image' do
is_expected.to contain_file('/tftpboot/snponly.efi').with( is_expected.to contain_file('/tftpboot/snponly.efi').with(
'owner' => 'ironic', 'owner' => 'ironic',
'group' => 'ironic', 'group' => 'ironic',
'require' => 'Anchor[ironic-inspector::install::end]', 'require' => 'Anchor[ironic-inspector::install::end]',
'seltype' => 'tftpdir_t', 'seltype' => 'tftpdir_t',
'ensure' => 'file', 'ensure' => 'file',
'backup' => false, 'show_diff' => false,
'backup' => false,
) )
end end
@@ -106,22 +108,24 @@ describe 'ironic::pxe' do
it 'should contain iPXE chainload images' do it 'should contain iPXE chainload images' do
is_expected.to contain_file('/var/lib/tftpboot/undionly.kpxe').with( is_expected.to contain_file('/var/lib/tftpboot/undionly.kpxe').with(
'owner' => 'ironic', 'owner' => 'ironic',
'group' => 'ironic', 'group' => 'ironic',
'require' => 'Anchor[ironic-inspector::install::end]', 'require' => 'Anchor[ironic-inspector::install::end]',
'seltype' => 'tftpdir_t', 'seltype' => 'tftpdir_t',
'ensure' => 'file', 'ensure' => 'file',
'backup' => false, 'show_diff' => false,
'backup' => false,
) )
end end
it 'should contain iPXE UEFI chainload image' do it 'should contain iPXE UEFI chainload image' do
is_expected.to contain_file('/var/lib/tftpboot/snponly.efi').with( is_expected.to contain_file('/var/lib/tftpboot/snponly.efi').with(
'owner' => 'ironic', 'owner' => 'ironic',
'group' => 'ironic', 'group' => 'ironic',
'require' => 'Anchor[ironic-inspector::install::end]', 'require' => 'Anchor[ironic-inspector::install::end]',
'seltype' => 'tftpdir_t', 'seltype' => 'tftpdir_t',
'ensure' => 'file', 'ensure' => 'file',
'backup' => false, 'show_diff' => false,
'backup' => false,
) )
end end
end end