openstack
/
puppet-glance
Code Issues Proposed changes

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: Idd27daadfd1294d7f83777f851a1f39a7f860308
This commit is contained in:
Juan Antonio Osorio Robles 2017-10-06 13:00:14 +03:00
parent 3927224fa0
commit 72ed4084c0
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/api/logging.pp
View File

@ -117,7 +117,11 @@ class glance::api::logging(
$use_syslog_real = pick($::glance::api::use_syslog,$use_syslog)
$use_stderr_real = pick($::glance::api::use_stderr,$use_stderr)
$log_facility_real = pick($::glance::api::log_facility,$log_facility)
$log_dir_real = pick($::glance::api::log_dir,$log_dir)
if $log_dir != '' {
$log_dir_real = pick($::glance::api::log_dir,$log_dir)
} else {
$log_dir_real = $log_dir
}
$log_file_real = pick($::glance::api::log_file,$log_file)
$debug_real = pick($::glance::api::debug,$debug)

6
manifests/registry/logging.pp
View File

@ -117,7 +117,11 @@ class glance::registry::logging(
$use_syslog_real = pick($::glance::registry::use_syslog,$use_syslog)
$use_stderr_real = pick($::glance::registry::use_stderr,$use_stderr)
$log_facility_real = pick($::glance::registry::log_facility,$log_facility)
$log_dir_real = pick($::glance::registry::log_dir,$log_dir)
if $log_dir != '' {
$log_dir_real = pick($::glance::registry::log_dir,$log_dir)
} else {
$log_dir_real = $log_dir
}
$log_file_real = pick($::glance::registry::log_file,$log_file)
$debug_real = pick($::glance::registry::debug,$debug)