From bc930629622e3b56fdf248ef5b1ef7d694a84952 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Tue, 10 Oct 2017 08:04:16 +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: I79d3df78d6c78dc767625d11c6c6e29192192da3 --- manifests/logging.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifests/logging.pp b/manifests/logging.pp index 88a85a04..3cf9d6ce 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -112,7 +112,11 @@ class aodh::logging( $use_syslog_real = pick($::aodh::use_syslog,$use_syslog) $use_stderr_real = pick($::aodh::use_stderr,$use_stderr) $log_facility_real = pick($::aodh::log_facility,$log_facility) - $log_dir_real = pick($::aodh::log_dir,$log_dir) + if $log_dir != '' { + $log_dir_real = pick($::aodh::log_dir,$log_dir) + } else { + $log_dir_real = $log_dir + } $debug_real = pick($::aodh::debug,$debug) oslo::log { 'aodh_config':