diff --git a/manifests/containerreconciler.pp b/manifests/containerreconciler.pp index 811d6a09..6ef69a32 100644 --- a/manifests/containerreconciler.pp +++ b/manifests/containerreconciler.pp @@ -89,11 +89,11 @@ # # [*log_name*] # (optional) Log name. -# Defaults to $facts['os_service_default']. +# Defaults to 'container-reconciler'. # # [*log_level*] # (optional) Log level. -# Defaults to $facts['os_service_default']. +# Defaults to 'INFO'. # # [*log_facility*] # (optional) Log level @@ -129,7 +129,7 @@ class swift::containerreconciler( $cache_tls_cafile = $facts['os_service_default'], $cache_tls_certfile = $facts['os_service_default'], $cache_tls_keyfile = $facts['os_service_default'], - $log_name = $facts['os_service_default'], + $log_name = 'container-reconciler', $log_level = 'INFO', $log_facility = 'LOG_LOCAL2', $log_address = '/dev/log', diff --git a/manifests/objectexpirer.pp b/manifests/objectexpirer.pp index 18e99259..df4cffa5 100644 --- a/manifests/objectexpirer.pp +++ b/manifests/objectexpirer.pp @@ -95,7 +95,7 @@ # # [*log_name*] # (optional) Log name. -# Defaults to $facts['os_service_default']. +# Defaults to 'object-expirer'. # # [*log_level*] # (optional) Log level. @@ -137,7 +137,7 @@ class swift::objectexpirer( $cache_tls_cafile = $facts['os_service_default'], $cache_tls_certfile = $facts['os_service_default'], $cache_tls_keyfile = $facts['os_service_default'], - $log_name = $facts['os_service_default'], + $log_name = 'object-expirer', $log_level = 'INFO', $log_facility = 'LOG_LOCAL2', $log_address = '/dev/log', diff --git a/spec/classes/swift_containerreconciler_spec.rb b/spec/classes/swift_containerreconciler_spec.rb index 5327b871..b2727154 100644 --- a/spec/classes/swift_containerreconciler_spec.rb +++ b/spec/classes/swift_containerreconciler_spec.rb @@ -35,7 +35,7 @@ describe 'swift::containerreconciler' do is_expected.to contain_swift_container_reconciler_config( 'container-reconciler/request_tries').with_value('') is_expected.to contain_swift_container_reconciler_config( - 'container-reconciler/log_name').with_value('') + 'container-reconciler/log_name').with_value('container-reconciler') is_expected.to contain_swift_container_reconciler_config( 'container-reconciler/log_level').with_value('INFO') is_expected.to contain_swift_container_reconciler_config( diff --git a/spec/classes/swift_objectexpirer_spec.rb b/spec/classes/swift_objectexpirer_spec.rb index c1aeca83..5fd8ffae 100644 --- a/spec/classes/swift_objectexpirer_spec.rb +++ b/spec/classes/swift_objectexpirer_spec.rb @@ -39,7 +39,7 @@ describe 'swift::objectexpirer' do is_expected.to contain_swift_object_expirer_config( 'object-expirer/report_interval').with_value('') is_expected.to contain_swift_object_expirer_config( - 'object-expirer/log_name').with_value('') + 'object-expirer/log_name').with_value('object-expirer') is_expected.to contain_swift_object_expirer_config( 'object-expirer/log_level').with_value('INFO') is_expected.to contain_swift_object_expirer_config(