openstack
/
puppet-ironic
Code Issues Proposed changes

inspector: Use config file installed by the package 

... instead of ensuring/creating the file.

Change-Id: Ifa76da52a75031ec767f374e6d33bd66315634d3
This commit is contained in:
Takashi Kajinami 2022-07-03 22:32:42 +09:00
parent 8672adf57a
commit 5fe5a0737f
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/inspector.pp
View File

@ -252,13 +252,6 @@ class ironic::inspector (
$ipxe_timeout_real = pick($::ironic::pxe::common::ipxe_timeout, $ipxe_timeout)
$uefi_ipxe_bootfile_name_real = pick($::ironic::pxe::common::uefi_ipxe_bootfile_name, $uefi_ipxe_bootfile_name)
file { '/etc/ironic-inspector/inspector.conf':
ensure => 'present',
owner => $::ironic::params::inspector_user,
group => $::ironic::params::inspector_group,
require => Anchor['ironic-inspector::config::begin'],
}
$dnsmasq_local_ip_real = normalize_ip_for_uri($dnsmasq_local_ip)
$dnsmasq_ip_subnets_real = ipv6_normalize_dnsmasq_ip_subnets($dnsmasq_ip_subnets)

8
spec/classes/ironic_inspector_spec.rb
View File

@ -127,14 +127,6 @@ describe 'ironic::inspector' do
is_expected.to contain_ironic_inspector_config('port_physnet/cidr_map').with_value('')
end
it 'should contain file /etc/ironic-inspector/inspector.conf' do
is_expected.to contain_file('/etc/ironic-inspector/inspector.conf').with(
'ensure' => 'present',
'owner' => 'ironic-inspector',
'group' => 'ironic-inspector',
'require' => 'Anchor[ironic-inspector::config::begin]',
)
end
it 'should contain file /etc/ironic-inspector/dnsmasq.conf' do
is_expected.to contain_file('/etc/ironic-inspector/dnsmasq.conf').with(
'ensure' => 'present',