Remove POSIX users, groups, and file modes.
These entries should be removed from the manifests as these settings should be delivered by packaging tools. Change-Id: I0fb78afeb3b78b66d9f20542f0465116ff531483 Closes-Bug: #1458915
This commit is contained in:
parent
3e80d4a9f9
commit
ecd295ae57
@ -8,7 +8,7 @@ class cinder::db::sync {
|
||||
path => '/usr/bin',
|
||||
user => 'cinder',
|
||||
refreshonly => true,
|
||||
require => [File[$::cinder::params::cinder_conf], Class['cinder']],
|
||||
require => Class['cinder'],
|
||||
logoutput => 'on_failure',
|
||||
}
|
||||
}
|
||||
|
@ -294,22 +294,6 @@ class cinder (
|
||||
require => Anchor['cinder-start'],
|
||||
}
|
||||
|
||||
file { $::cinder::params::cinder_conf:
|
||||
ensure => present,
|
||||
owner => 'cinder',
|
||||
group => 'cinder',
|
||||
mode => '0600',
|
||||
require => Package['cinder'],
|
||||
}
|
||||
|
||||
file { $::cinder::params::cinder_paste_api_ini:
|
||||
ensure => present,
|
||||
owner => 'cinder',
|
||||
group => 'cinder',
|
||||
mode => '0600',
|
||||
require => Package['cinder'],
|
||||
}
|
||||
|
||||
if $rpc_backend == 'cinder.openstack.common.rpc.impl_kombu' {
|
||||
|
||||
if ! $rabbit_password {
|
||||
|
@ -2,9 +2,6 @@
|
||||
#
|
||||
class cinder::params {
|
||||
|
||||
$cinder_conf = '/etc/cinder/cinder.conf'
|
||||
$cinder_paste_api_ini = '/etc/cinder/api-paste.ini'
|
||||
|
||||
if $::osfamily == 'Debian' {
|
||||
$package_name = 'cinder-common'
|
||||
$client_package = 'python-cinderclient'
|
||||
|
@ -41,20 +41,6 @@ describe 'cinder' do
|
||||
is_expected.to contain_cinder_config('DEFAULT/log_dir').with(:value => '/var/log/cinder')
|
||||
end
|
||||
|
||||
it { is_expected.to contain_file('/etc/cinder/cinder.conf').with(
|
||||
:owner => 'cinder',
|
||||
:group => 'cinder',
|
||||
:mode => '0600',
|
||||
:require => 'Package[cinder]'
|
||||
) }
|
||||
|
||||
it { is_expected.to contain_file('/etc/cinder/api-paste.ini').with(
|
||||
:owner => 'cinder',
|
||||
:group => 'cinder',
|
||||
:mode => '0600',
|
||||
:require => 'Package[cinder]'
|
||||
) }
|
||||
|
||||
end
|
||||
describe 'with modified rabbit_hosts' do
|
||||
let :params do
|
||||
|
Loading…
x
Reference in New Issue
Block a user