From d620568ddc7a23e83d263b1e7366d84698c5c210 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Tue, 3 Oct 2017 11:00:25 +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: Idf5d3be959a55021e02eb64f45a950a82cb77a79 --- manifests/logging.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifests/logging.pp b/manifests/logging.pp index 4bdaef566..eb7ccfaed 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -111,7 +111,11 @@ class nova::logging( $use_syslog_real = pick($::nova::use_syslog,$use_syslog) $use_stderr_real = pick($::nova::use_stderr,$use_stderr) $log_facility_real = pick($::nova::log_facility,$log_facility) - $log_dir_real = pick($::nova::log_dir,$log_dir) + if $log_dir != '' { + $log_dir_real = pick($::nova::log_dir,$log_dir) + } else { + $log_dir_real = $log_dir + } $debug_real = pick($::nova::debug,$debug) oslo::log { 'nova_config':