stop managing /etc/ironic and ironic.conf
They should be managed by packaging. Change-Id: I2073298312b2fadd5c1c7cf011b8610b0ec122a4
This commit is contained in:
parent
76efd1bd10
commit
5109bf7461
@ -375,17 +375,6 @@ class ironic (
|
|||||||
$rabbit_user_real = $rabbit_userid
|
$rabbit_user_real = $rabbit_userid
|
||||||
}
|
}
|
||||||
|
|
||||||
file { '/etc/ironic':
|
|
||||||
ensure => directory,
|
|
||||||
require => Package['ironic-common'],
|
|
||||||
group => 'ironic',
|
|
||||||
}
|
|
||||||
|
|
||||||
file { '/etc/ironic/ironic.conf':
|
|
||||||
require => Package['ironic-common'],
|
|
||||||
group => 'ironic',
|
|
||||||
}
|
|
||||||
|
|
||||||
package { 'ironic-common':
|
package { 'ironic-common':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
name => $::ironic::params::common_package_name,
|
name => $::ironic::params::common_package_name,
|
||||||
|
4
releasenotes/notes/config_dir-e902bfe9ed578bd9.yaml
Normal file
4
releasenotes/notes/config_dir-e902bfe9ed578bd9.yaml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- Stop managing /etc/ironic and /etc/ironic/ironic.conf since they
|
||||||
|
should already be managed by packaging.
|
@ -76,21 +76,6 @@ describe 'ironic' do
|
|||||||
it { is_expected.to contain_class('ironic::logging') }
|
it { is_expected.to contain_class('ironic::logging') }
|
||||||
it { is_expected.to contain_class('ironic::params') }
|
it { is_expected.to contain_class('ironic::params') }
|
||||||
|
|
||||||
it 'configures ironic configuration folder' do
|
|
||||||
is_expected.to contain_file('/etc/ironic').with(
|
|
||||||
:ensure => 'directory',
|
|
||||||
:group => 'ironic',
|
|
||||||
:require => 'Package[ironic-common]'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'configures ironic configuration file' do
|
|
||||||
is_expected.to contain_file('/etc/ironic/ironic.conf').with(
|
|
||||||
:group => 'ironic',
|
|
||||||
:require => 'Package[ironic-common]'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'installs ironic package' do
|
it 'installs ironic package' do
|
||||||
is_expected.to contain_package('ironic-common').with(
|
is_expected.to contain_package('ironic-common').with(
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user