Don't manage chmod for /etc/neutron and neutron.conf
Debian/Ubuntu & Fedora packaging use different modes that mean Puppet will override the mode and break idempotency between runs. This patch aims to drop the modes for /etc/neutron and neutron.conf to ensure idempotency between runs. [1] Second run of Puppet on Ubuntu: /Stage[main]/Neutron/File[/etc/neutron]/mode: mode changed '0755' to '0750' Change-Id: I661b0ea94e151a47ab71355058f7ac971915c116
This commit is contained in:
@@ -310,12 +310,10 @@ class neutron (
|
|||||||
require => Package['neutron'],
|
require => Package['neutron'],
|
||||||
owner => 'root',
|
owner => 'root',
|
||||||
group => 'neutron',
|
group => 'neutron',
|
||||||
mode => '0640',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
file { '/etc/neutron':
|
file { '/etc/neutron':
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
mode => '0750',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
file { '/etc/neutron/neutron.conf': }
|
file { '/etc/neutron/neutron.conf': }
|
||||||
|
@@ -78,7 +78,6 @@ describe 'neutron' do
|
|||||||
:ensure => 'directory',
|
:ensure => 'directory',
|
||||||
:owner => 'root',
|
:owner => 'root',
|
||||||
:group => 'neutron',
|
:group => 'neutron',
|
||||||
:mode => '0750',
|
|
||||||
:require => 'Package[neutron]'
|
:require => 'Package[neutron]'
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
@@ -87,7 +86,6 @@ describe 'neutron' do
|
|||||||
is_expected.to contain_file('/etc/neutron/neutron.conf').with(
|
is_expected.to contain_file('/etc/neutron/neutron.conf').with(
|
||||||
:owner => 'root',
|
:owner => 'root',
|
||||||
:group => 'neutron',
|
:group => 'neutron',
|
||||||
:mode => '0640',
|
|
||||||
:require => 'Package[neutron]'
|
:require => 'Package[neutron]'
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user