openstack/puppet-ironic
Code Issues Proposed changes

Fix dependency references

Browse Source 
The latest version of puppet now reports these as catalog failures so
this change removes the unnecessary Package and Service references
since those are already handled by ironic::deps and fixes the invalid
anchor reference.

Change-Id: I3ef0165c844c36d72f8b1042ac7d482ac4209667
Closes-Bug: #1702964
This commit is contained in:
ZhongShengping 2017-07-10 16:35:47 +08:00
parent bffd190054
commit 90b78634df
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/bifrost.pp
View File

@ -206,13 +206,16 @@ class ironic::bifrost (
file { "${bifrost_config_folder}/bifrost_global_vars": file { "${bifrost_config_folder}/bifrost_global_vars":
ensure => present, ensure => present,
content => template('ironic/bifrost_global_vars.erb'), content => template('ironic/bifrost_global_vars.erb'),
require => File[$bifrost_config_folder], tag => 'bifrost-file',
} }
file { "${bifrost_config_folder}/baremetal.json": file { "${bifrost_config_folder}/baremetal.json":
ensure => present, ensure => present,
content => template('ironic/baremetal.json.erb'), content => template('ironic/baremetal.json.erb'),
require => File[$bifrost_config_folder], tag => 'bifrost-file',
} }
File<| title == $bifrost_config_folder |> ~> File<| tag == 'bifrost-file' |>
} }

10
manifests/pxe.pp
View File

@ -77,7 +77,7 @@ class ironic::pxe (
seltype => 'tftpdir_t', seltype => 'tftpdir_t',
owner => 'ironic', owner => 'ironic',
group => 'ironic', group => 'ironic',
require => Package['ironic-common'], require => Anchor['ironic::install::end'],
} }
file { $http_root_real: file { $http_root_real:
@ -118,13 +118,13 @@ class ironic::pxe (
ensure_resource( 'package', 'syslinux', { ensure_resource( 'package', 'syslinux', {
ensure => $package_ensure, ensure => $package_ensure,
name => $::ironic::params::syslinux_package, name => $::ironic::params::syslinux_package,
tag => ['openstack', 'ironic-ipxe'], tag => ['openstack', 'ironic-ipxe', 'ironic-support-package'],
}) })
ironic::pxe::tftpboot_file { $syslinux_files: ironic::pxe::tftpboot_file { $syslinux_files:
source_directory => $syslinux_path, source_directory => $syslinux_path,
destination_directory => $tftp_root_real, destination_directory => $tftp_root_real,
require => Package['syslinux'], require => Anchor['ironic-inspector::install::end'],
} }
ensure_resource( 'package', 'ipxe', { ensure_resource( 'package', 'ipxe', {
@ -141,7 +141,7 @@ class ironic::pxe (
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 => Package['ipxe'], require => Anchor['ironic-inspector::install::end'],
} }
file { "${tftp_root_real}/ipxe.efi": file { "${tftp_root_real}/ipxe.efi":
@ -152,7 +152,7 @@ class ironic::pxe (
mode => '0744', mode => '0744',
source => "${::ironic::params::ipxe_rom_dir}/ipxe.efi", source => "${::ironic::params::ipxe_rom_dir}/ipxe.efi",
backup => false, backup => false,
require => Package['ipxe'], require => Anchor['ironic-inspector::install::end'],
} }
include ::apache include ::apache

2
spec/classes/ironic_bifrost_spec.rb
View File

@ -75,7 +75,6 @@ describe 'ironic::bifrost' do
it 'should contain file /etc/bifrost/bifrost_global_vars' do it 'should contain file /etc/bifrost/bifrost_global_vars' do
is_expected.to contain_file('/etc/bifrost/bifrost_global_vars').with( is_expected.to contain_file('/etc/bifrost/bifrost_global_vars').with(
'ensure' => 'present', 'ensure' => 'present',
'require' => 'File[/etc/bifrost]',
'content' => /ironic_url/, 'content' => /ironic_url/,
) )
end end
@ -83,7 +82,6 @@ describe 'ironic::bifrost' do
it 'should contain file /etc/bifrost/baremetal.json' do it 'should contain file /etc/bifrost/baremetal.json' do
is_expected.to contain_file('/etc/bifrost/baremetal.json').with( is_expected.to contain_file('/etc/bifrost/baremetal.json').with(
'ensure' => 'present', 'ensure' => 'present',
'require' => 'File[/etc/bifrost]',
'content' => /test/, 'content' => /test/,
) )
end end

6
spec/classes/ironic_pxe_spec.rb
View File

@ -33,7 +33,7 @@ describe 'ironic::pxe' do
is_expected.to contain_file('/tftpboot/pxelinux.cfg').with( is_expected.to contain_file('/tftpboot/pxelinux.cfg').with(
'owner' => 'ironic', 'owner' => 'ironic',
'group' => 'ironic', 'group' => 'ironic',
'require' => 'Package[ironic-common]', 'require' => 'Anchor[ironic::install::end]',
'ensure' => 'directory', 'ensure' => 'directory',
'seltype' => 'tftpdir_t', 'seltype' => 'tftpdir_t',
) )
@ -103,7 +103,7 @@ describe 'ironic::pxe' 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' => 'Package[ipxe]', 'require' => 'Anchor[ironic-inspector::install::end]',
'seltype' => 'tftpdir_t', 'seltype' => 'tftpdir_t',
'ensure' => 'present', 'ensure' => 'present',
'backup' => false, 'backup' => false,
@ -113,7 +113,7 @@ describe 'ironic::pxe' do
is_expected.to contain_file('/var/lib/tftpboot/ipxe.efi').with( is_expected.to contain_file('/var/lib/tftpboot/ipxe.efi').with(
'owner' => 'ironic', 'owner' => 'ironic',
'group' => 'ironic', 'group' => 'ironic',
'require' => 'Package[ipxe]', 'require' => 'Anchor[ironic-inspector::install::end]',
'seltype' => 'tftpdir_t', 'seltype' => 'tftpdir_t',
'ensure' => 'present', 'ensure' => 'present',
'backup' => false, 'backup' => false,