From 2d02f8924ea9c0e2423ad99cbe1f9ecc55206018 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Fri, 6 Oct 2017 13:00:04 +0300 Subject: [PATCH] Accept empty strings for log_dir An empty string is an acceptable value of this entry, and it forces logging to stdout/stderr, which is useful when running on containers. Change-Id: I392d113c13cb6ba77e1bbcaf1b37c54c8b0eb1a5 --- manifests/logging.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifests/logging.pp b/manifests/logging.pp index c8eb0ca..748b91c 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -111,7 +111,11 @@ class ceilometer::logging( $use_syslog_real = pick($::ceilometer::use_syslog,$use_syslog) $use_stderr_real = pick($::ceilometer::use_stderr,$use_stderr) $log_facility_real = pick($::ceilometer::log_facility,$log_facility) - $log_dir_real = pick($::ceilometer::log_dir,$log_dir) + if $log_dir != '' { + $log_dir_real = pick($::ceilometer::log_dir,$log_dir) + } else { + $log_dir_real = $log_dir + } $debug_real = pick($::ceilometer::debug,$debug) oslo::log { 'ceilometer_config': -- 2.45.2