diff --git a/manifests/dispersion.pp b/manifests/dispersion.pp index 0fc7ddae..349fcf61 100644 --- a/manifests/dispersion.pp +++ b/manifests/dispersion.pp @@ -88,7 +88,6 @@ class swift::dispersion ( ensure => file, owner => 'swift', group => 'swift', - mode => '0660', require => Package['swift'], } diff --git a/manifests/init.pp b/manifests/init.pp index df26f0ba..8316cf7e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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<||> diff --git a/manifests/proxy.pp b/manifests/proxy.pp index b050e5f5..bec925e2 100644 --- a/manifests/proxy.pp +++ b/manifests/proxy.pp @@ -176,7 +176,6 @@ class swift::proxy( concat { '/etc/swift/proxy-server.conf': owner => 'swift', group => 'swift', - mode => '0660', require => Package['swift-proxy'], } diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp index 3637cd6b..d4d8fc87 100644 --- a/manifests/storage/server.pp +++ b/manifests/storage/server.pp @@ -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( diff --git a/spec/classes/swift_dispersion_spec.rb b/spec/classes/swift_dispersion_spec.rb index ffa70a8c..27c3b06d 100644 --- a/spec/classes/swift_dispersion_spec.rb +++ b/spec/classes/swift_dispersion_spec.rb @@ -32,7 +32,6 @@ describe 'swift::dispersion' do :ensure => 'file', :owner => 'swift', :group => 'swift', - :mode => '0660', :require => 'Package[swift]') } diff --git a/spec/classes/swift_proxy_spec.rb b/spec/classes/swift_proxy_spec.rb index a45471db..23f5f5a6 100644 --- a/spec/classes/swift_proxy_spec.rb +++ b/spec/classes/swift_proxy_spec.rb @@ -50,7 +50,6 @@ describe 'swift::proxy' do {:ensure => 'present', :owner => 'swift', :group => 'swift', - :mode => '0660', } )} diff --git a/spec/classes/swift_spec.rb b/spec/classes/swift_spec.rb index 40fda169..c0f7960c 100644 --- a/spec/classes/swift_spec.rb +++ b/spec/classes/swift_spec.rb @@ -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(