Do not write /var/log/ceilometer
This patch reverts If7b88bf51046317171f6fa85bb8c01390fa26a37. ceilometermiddlware is supposed to use the same logger as proxy-server and doesn't directly touch log files but rely on rsyslog. Change-Id: I3e2a8ec96cb7b3befa6d840b0944b6f50203dd9e
This commit is contained in:
parent
e2b35f10a4
commit
35c905e430
|
@ -154,17 +154,9 @@ class swift::proxy::ceilometer(
|
|||
Package<| tag == 'ceilometer-package' |> -> User['swift']
|
||||
|
||||
if defined(Service['swift-proxy-server']) {
|
||||
File['/var/log/ceilometer/swift-proxy-server.log'] -> Service['swift-proxy-server']
|
||||
Package['python-ceilometermiddleware'] -> Service['swift-proxy-server']
|
||||
}
|
||||
|
||||
file { '/var/log/ceilometer/swift-proxy-server.log':
|
||||
ensure => file,
|
||||
mode => '0664',
|
||||
owner => 'swift',
|
||||
group => 'swift',
|
||||
}
|
||||
|
||||
if $auth_uri {
|
||||
warning('The swift::proxy::ceilometer::auth_uri parameter was deperecated, and has no effect')
|
||||
}
|
||||
|
|
|
@ -21,7 +21,6 @@ describe 'swift::proxy::ceilometer' do
|
|||
it { is_expected.to contain_swift_proxy_config('filter:ceilometer/url').with_value('rabbit://user_1:user_1_passw@1.1.1.1:5673/rabbit').with_secret(true) }
|
||||
it { is_expected.to contain_swift_proxy_config('filter:ceilometer/nonblocking_notify').with_value('false') }
|
||||
it { is_expected.to contain_user('swift').with_groups('ceilometer') }
|
||||
it { is_expected.to contain_file('/var/log/ceilometer/swift-proxy-server.log').with(:owner => 'swift', :group => 'swift', :mode => '0664') }
|
||||
end
|
||||
|
||||
describe "when overriding default parameters with rabbit driver" do
|
||||
|
|
Loading…
Reference in New Issue