diff --git a/manifests/init.pp b/manifests/init.pp index c456ce65..ceed8feb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -375,17 +375,6 @@ class ironic ( $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': ensure => $package_ensure, name => $::ironic::params::common_package_name, diff --git a/releasenotes/notes/config_dir-e902bfe9ed578bd9.yaml b/releasenotes/notes/config_dir-e902bfe9ed578bd9.yaml new file mode 100644 index 00000000..a5a77115 --- /dev/null +++ b/releasenotes/notes/config_dir-e902bfe9ed578bd9.yaml @@ -0,0 +1,4 @@ +--- +features: + - Stop managing /etc/ironic and /etc/ironic/ironic.conf since they + should already be managed by packaging. diff --git a/spec/classes/ironic_init_spec.rb b/spec/classes/ironic_init_spec.rb index 8d30676e..efdd8272 100644 --- a/spec/classes/ironic_init_spec.rb +++ b/spec/classes/ironic_init_spec.rb @@ -76,21 +76,6 @@ describe 'ironic' do it { is_expected.to contain_class('ironic::logging') } 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 is_expected.to contain_package('ironic-common').with( :ensure => 'present',