Merge "remove POSIX users, groups and file modes"
This commit is contained in:
commit
1d9f2a93c9
|
@ -374,22 +374,6 @@ class manila (
|
|||
tag => ['openstack', 'manila-package'],
|
||||
}
|
||||
|
||||
file { $::manila::params::manila_conf:
|
||||
ensure => present,
|
||||
owner => 'manila',
|
||||
group => 'manila',
|
||||
mode => '0600',
|
||||
require => Package['manila'],
|
||||
}
|
||||
|
||||
file { $::manila::params::manila_paste_api_ini:
|
||||
ensure => present,
|
||||
owner => 'manila',
|
||||
group => 'manila',
|
||||
mode => '0600',
|
||||
require => Package['manila'],
|
||||
}
|
||||
|
||||
if $rpc_backend == 'manila.openstack.common.rpc.impl_kombu' or $rpc_backend == 'rabbit' {
|
||||
|
||||
if ! $rabbit_password {
|
||||
|
|
|
@ -71,22 +71,8 @@ describe 'manila' do
|
|||
)
|
||||
is_expected.to contain_manila_config('DEFAULT/log_dir').with(:value => '/var/log/manila')
|
||||
end
|
||||
|
||||
it { is_expected.to contain_file('/etc/manila/manila.conf').with(
|
||||
:owner => 'manila',
|
||||
:group => 'manila',
|
||||
:mode => '0600',
|
||||
:require => 'Package[manila]'
|
||||
) }
|
||||
|
||||
it { is_expected.to contain_file('/etc/manila/api-paste.ini').with(
|
||||
:owner => 'manila',
|
||||
:group => 'manila',
|
||||
:mode => '0600',
|
||||
:require => 'Package[manila]'
|
||||
) }
|
||||
|
||||
end
|
||||
|
||||
describe 'with modified rabbit_hosts' do
|
||||
let :params do
|
||||
req_params.merge({'rabbit_hosts' => ['rabbit1:5672', 'rabbit2:5672']})
|
||||
|
|
Loading…
Reference in New Issue