3259caa0ef
Few weeks ago, a patchset[1] that aims to treat the value '<SERVICE
DEFAULT>' of a parameter as if ensure => absent has been merged.
The final objective of this patch was to make our manifests lighter to
read and write by avoiding the pattern
if $var { value => $var } else { ensure => absent }
This commit brings this feature to the puppet-cinder module and remains
backward compatible with what was in place before.
This commit switches a part of the module, another commit will switch the
other part (init.pp/paste).
The split in reviews aims to offer :
* easier readability on this one
* the other review might needs other change as well - not a drop in
replacement, contrary to this one so it is simpler to split it.
[1]
b554d30aaf
Change-Id: I005096625a9ea7d069893e4a3d64aa31e074378e
92 lines
3.2 KiB
Ruby
92 lines
3.2 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe 'cinder::logging' do
|
|
|
|
let :params do
|
|
{
|
|
}
|
|
end
|
|
|
|
let :log_params do
|
|
{
|
|
:logging_context_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s',
|
|
:logging_default_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s',
|
|
:logging_debug_format_suffix => '%(funcName)s %(pathname)s:%(lineno)d',
|
|
:logging_exception_prefix => '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s',
|
|
:log_config_append => '/etc/cinder/logging.conf',
|
|
:publish_errors => true,
|
|
:default_log_levels => {
|
|
'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
|
|
'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO',
|
|
'iso8601' => 'WARN',
|
|
'requests.packages.urllib3.connectionpool' => 'WARN' },
|
|
:fatal_deprecations => true,
|
|
:instance_format => '[instance: %(uuid)s] ',
|
|
:instance_uuid_format => '[instance: %(uuid)s] ',
|
|
:log_date_format => '%Y-%m-%d %H:%M:%S',
|
|
}
|
|
end
|
|
|
|
shared_examples_for 'cinder-logging' do
|
|
|
|
context 'with extended logging options' do
|
|
before { params.merge!( log_params ) }
|
|
it_configures 'logging params set'
|
|
end
|
|
|
|
end
|
|
|
|
shared_examples_for 'logging params set' do
|
|
it 'enables logging params' do
|
|
is_expected.to contain_cinder_config('DEFAULT/logging_context_format_string').with_value(
|
|
'%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s')
|
|
|
|
is_expected.to contain_cinder_config('DEFAULT/logging_default_format_string').with_value(
|
|
'%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s')
|
|
|
|
is_expected.to contain_cinder_config('DEFAULT/logging_debug_format_suffix').with_value(
|
|
'%(funcName)s %(pathname)s:%(lineno)d')
|
|
|
|
is_expected.to contain_cinder_config('DEFAULT/logging_exception_prefix').with_value(
|
|
'%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s')
|
|
|
|
is_expected.to contain_cinder_config('DEFAULT/log_config_append').with_value(
|
|
'/etc/cinder/logging.conf')
|
|
is_expected.to contain_cinder_config('DEFAULT/publish_errors').with_value(
|
|
true)
|
|
|
|
is_expected.to contain_cinder_config('DEFAULT/default_log_levels').with_value(
|
|
'amqp=WARN,amqplib=WARN,boto=WARN,iso8601=WARN,qpid=WARN,requests.packages.urllib3.connectionpool=WARN,sqlalchemy=WARN,suds=INFO')
|
|
|
|
is_expected.to contain_cinder_config('DEFAULT/fatal_deprecations').with_value(
|
|
true)
|
|
|
|
is_expected.to contain_cinder_config('DEFAULT/instance_format').with_value(
|
|
'[instance: %(uuid)s] ')
|
|
|
|
is_expected.to contain_cinder_config('DEFAULT/instance_uuid_format').with_value(
|
|
'[instance: %(uuid)s] ')
|
|
|
|
is_expected.to contain_cinder_config('DEFAULT/log_date_format').with_value(
|
|
'%Y-%m-%d %H:%M:%S')
|
|
end
|
|
end
|
|
|
|
context 'on Debian platforms' do
|
|
let :facts do
|
|
{ :osfamily => 'Debian' }
|
|
end
|
|
|
|
it_configures 'cinder-logging'
|
|
end
|
|
|
|
context 'on RedHat platforms' do
|
|
let :facts do
|
|
{ :osfamily => 'RedHat' }
|
|
end
|
|
|
|
it_configures 'cinder-logging'
|
|
end
|
|
|
|
end
|