stackforge/puppet-openstack-cloud
Code Issues Proposed changes

[image] Disable fs logging if syslog is enabled (refs: #187)

Browse Source
This commit is contained in:
Sebastien Badia 2014-02-20 19:20:58 +01:00
parent ad282d0b51
commit e78b98d148
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/image.pp
View File

@ -88,6 +88,17 @@ class cloud::image(
$use_syslog = $os_params::use_syslog $use_syslog = $os_params::use_syslog
) { ) {
# Disable twice logging if syslog is enabled
if $use_syslog {
$log_dir = false
$log_file_api = false
$log_file_registry = false
} else {
$log_dir = '/var/log/glance'
$log_file_api = '/var/log/glance/api.log'
$log_file_registry = '/var/log/glance/registry.log'
}
$encoded_glance_user = uriescape($glance_db_user) $encoded_glance_user = uriescape($glance_db_user)
$encoded_glance_password = uriescape($glance_db_password) $encoded_glance_password = uriescape($glance_db_password)
@ -117,6 +128,8 @@ class cloud::image(
keystone_tenant => 'services', keystone_tenant => 'services',
keystone_user => 'glance', keystone_user => 'glance',
bind_host => $api_eth, bind_host => $api_eth,
log_dir => $log_dir,
log_file => $log_file_registry,
bind_port => $ks_glance_registry_internal_port, bind_port => $ks_glance_registry_internal_port,
use_syslog => $use_syslog, use_syslog => $use_syslog,
log_facility => $log_facility, log_facility => $log_facility,