Stop managing file modes
File modes should be managed by packaging, not by Puppet. This patch aims to stop managing File { mode => } parameters. Partial-bug: #1458915 Change-Id: Ic38317521ac4a91bfdf234ecb4c74e4b00e3d887
This commit is contained in:
parent
e1ecd15f7d
commit
47ac5095b3
@ -88,7 +88,6 @@ class swift::dispersion (
|
||||
ensure => file,
|
||||
owner => 'swift',
|
||||
group => 'swift',
|
||||
mode => '0660',
|
||||
require => Package['swift'],
|
||||
}
|
||||
|
||||
|
@ -53,7 +53,6 @@ class swift(
|
||||
|
||||
file { '/etc/swift':
|
||||
ensure => directory,
|
||||
mode => '2770',
|
||||
}
|
||||
user {'swift':
|
||||
ensure => present,
|
||||
@ -67,7 +66,6 @@ class swift(
|
||||
|
||||
file { '/etc/swift/swift.conf':
|
||||
ensure => file,
|
||||
mode => '0660',
|
||||
}
|
||||
|
||||
File['/etc/swift/swift.conf'] -> Swift_config<||>
|
||||
|
@ -176,7 +176,6 @@ class swift::proxy(
|
||||
concat { '/etc/swift/proxy-server.conf':
|
||||
owner => 'swift',
|
||||
group => 'swift',
|
||||
mode => '0660',
|
||||
require => Package['swift-proxy'],
|
||||
}
|
||||
|
||||
|
@ -195,7 +195,6 @@ define swift::storage::server(
|
||||
group => $group,
|
||||
notify => Service["swift-${type}", "swift-${type}-replicator"],
|
||||
require => Package['swift'],
|
||||
mode => '0640',
|
||||
}
|
||||
|
||||
$required_middlewares = split(
|
||||
|
@ -32,7 +32,6 @@ describe 'swift::dispersion' do
|
||||
:ensure => 'file',
|
||||
:owner => 'swift',
|
||||
:group => 'swift',
|
||||
:mode => '0660',
|
||||
:require => 'Package[swift]')
|
||||
}
|
||||
|
||||
|
@ -50,7 +50,6 @@ describe 'swift::proxy' do
|
||||
{:ensure => 'present',
|
||||
:owner => 'swift',
|
||||
:group => 'swift',
|
||||
:mode => '0660',
|
||||
}
|
||||
)}
|
||||
|
||||
|
@ -36,8 +36,7 @@ describe 'swift' do
|
||||
end
|
||||
it {is_expected.to contain_user('swift')}
|
||||
it {is_expected.to contain_file('/etc/swift').with(
|
||||
{:ensure => 'directory', :mode => '2770'
|
||||
}.merge(file_defaults)
|
||||
{:ensure => 'directory'}.merge(file_defaults)
|
||||
)}
|
||||
it {is_expected.to contain_file('/var/run/swift').with(
|
||||
{:ensure => 'directory'}.merge(file_defaults)
|
||||
@ -46,9 +45,7 @@ describe 'swift' do
|
||||
{:ensure => 'directory'}.merge(file_defaults)
|
||||
)}
|
||||
it {is_expected.to contain_file('/etc/swift/swift.conf').with(
|
||||
{ :ensure => 'file',
|
||||
:mode => '0660'
|
||||
}.merge(file_defaults)
|
||||
{:ensure => 'file'}.merge(file_defaults)
|
||||
)}
|
||||
it 'configures swift.conf' do
|
||||
is_expected.to contain_swift_config(
|
||||
|
Loading…
Reference in New Issue
Block a user