Merge "Accept empty strings for log_dir"

This commit is contained in:
Jenkins
2017-10-06 09:09:01 +00:00
committed by Gerrit Code Review

View File

@@ -111,7 +111,11 @@ class nova::logging(
$use_syslog_real = pick($::nova::use_syslog,$use_syslog) $use_syslog_real = pick($::nova::use_syslog,$use_syslog)
$use_stderr_real = pick($::nova::use_stderr,$use_stderr) $use_stderr_real = pick($::nova::use_stderr,$use_stderr)
$log_facility_real = pick($::nova::log_facility,$log_facility) $log_facility_real = pick($::nova::log_facility,$log_facility)
if $log_dir != '' {
$log_dir_real = pick($::nova::log_dir,$log_dir) $log_dir_real = pick($::nova::log_dir,$log_dir)
} else {
$log_dir_real = $log_dir
}
$debug_real = pick($::nova::debug,$debug) $debug_real = pick($::nova::debug,$debug)
oslo::log { 'nova_config': oslo::log { 'nova_config':