Merge "Support more log_address options"
This commit is contained in:
commit
260ab6af21
@ -99,6 +99,10 @@
|
||||
# (optional) Log level
|
||||
# Defaults to 'LOG_LOCAL2'.
|
||||
#
|
||||
# [*log_address*]
|
||||
# (optional) Location where syslog sends the logs to.
|
||||
# Defaults to '/dev/log'.
|
||||
#
|
||||
# [*purge_config*]
|
||||
# (optional) Whether to set only the specified config options
|
||||
# in the proxy config.
|
||||
@ -124,6 +128,7 @@ class swift::containerreconciler(
|
||||
$log_name = $facts['os_service_default'],
|
||||
$log_level = 'INFO',
|
||||
$log_facility = 'LOG_LOCAL2',
|
||||
$log_address = '/dev/log',
|
||||
Boolean $purge_config = false,
|
||||
) inherits swift::params {
|
||||
|
||||
@ -191,6 +196,7 @@ class swift::containerreconciler(
|
||||
'container-reconciler/log_name': value => $log_name;
|
||||
'container-reconciler/log_facility': value => $log_facility;
|
||||
'container-reconciler/log_level': value => $log_level;
|
||||
'container-reconciler/log_address': value => $log_address;
|
||||
}
|
||||
|
||||
if $manage_service {
|
||||
|
@ -105,6 +105,10 @@
|
||||
# (optional) Log level
|
||||
# Defaults to 'LOG_LOCAL2'.
|
||||
#
|
||||
# [*log_address*]
|
||||
# (optional) Location where syslog sends the logs to.
|
||||
# Defaults to '/dev/log'.
|
||||
#
|
||||
# [*purge_config*]
|
||||
# (optional) Whether to set only the specified config options
|
||||
# in the object expirer config.
|
||||
@ -132,6 +136,7 @@ class swift::objectexpirer(
|
||||
$log_name = $facts['os_service_default'],
|
||||
$log_level = 'INFO',
|
||||
$log_facility = 'LOG_LOCAL2',
|
||||
$log_address = '/dev/log',
|
||||
Boolean $purge_config = false,
|
||||
) inherits swift::params {
|
||||
|
||||
@ -211,6 +216,7 @@ class swift::objectexpirer(
|
||||
'object-expirer/log_name': value => $log_name;
|
||||
'object-expirer/log_facility': value => $log_facility;
|
||||
'object-expirer/log_level': value => $log_level;
|
||||
'object-expirer/log_address': value => $log_address;
|
||||
}
|
||||
|
||||
if $manage_service {
|
||||
|
@ -0,0 +1,7 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The new ``swift::objectexpirer::log_address`` option has been added.
|
||||
|
||||
- |
|
||||
The new ``swift::containerreconciler::log_address`` option has been added.
|
@ -40,6 +40,8 @@ describe 'swift::containerreconciler' do
|
||||
'container-reconciler/log_level').with_value('INFO')
|
||||
is_expected.to contain_swift_container_reconciler_config(
|
||||
'container-reconciler/log_facility').with_value('LOG_LOCAL2')
|
||||
is_expected.to contain_swift_container_reconciler_config(
|
||||
'container-reconciler/log_address').with_value('/dev/log')
|
||||
is_expected.to contain_swift_container_reconciler_config(
|
||||
'filter:cache/memcache_servers').with_value('127.0.0.1:11211')
|
||||
is_expected.to contain_swift_container_reconciler_config(
|
||||
|
@ -44,6 +44,8 @@ describe 'swift::objectexpirer' do
|
||||
'object-expirer/log_level').with_value('INFO')
|
||||
is_expected.to contain_swift_object_expirer_config(
|
||||
'object-expirer/log_facility').with_value('LOG_LOCAL2')
|
||||
is_expected.to contain_swift_object_expirer_config(
|
||||
'object-expirer/log_address').with_value('/dev/log')
|
||||
is_expected.to contain_swift_object_expirer_config(
|
||||
'filter:cache/memcache_servers').with_value('127.0.0.1:11211')
|
||||
is_expected.to contain_swift_object_expirer_config(
|
||||
|
Loading…
Reference in New Issue
Block a user