openstack/puppet-neutron
Code Issues Proposed changes

Accept empty strings for log_dir

Browse Source 
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: I9d5b4e6c0fb0fa238e9a12494790c0fa5a83dd5b
This commit is contained in:
Juan Antonio Osorio Robles 2017-10-06 13:00:19 +03:00
parent ade98626f7
commit bb1b04b4e7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/logging.pp
View File

@ -125,7 +125,11 @@ class neutron::logging (
$use_syslog_real = pick($::neutron::use_syslog,$use_syslog) $use_syslog_real = pick($::neutron::use_syslog,$use_syslog)
$use_stderr_real = pick($::neutron::use_stderr,$use_stderr) $use_stderr_real = pick($::neutron::use_stderr,$use_stderr)
$log_file_real = pick($::neutron::log_file,$log_file) $log_file_real = pick($::neutron::log_file,$log_file)
$log_dir_real = pick($::neutron::log_dir,$log_dir) if $log_dir != '' {
$log_dir_real = pick($::neutron::log_dir,$log_dir)
} else {
$log_dir_real = $log_dir
}
oslo::log { 'neutron_config': oslo::log { 'neutron_config':
debug => $debug_real, debug => $debug_real,