From e78b98d14821a6db5c135e46b2b3ca314f7d7778 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Thu, 20 Feb 2014 19:20:58 +0100 Subject: [PATCH] [image] Disable fs logging if syslog is enabled (refs: #187) --- manifests/image.pp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/manifests/image.pp b/manifests/image.pp index 54568ff8..d7c79b09 100644 --- a/manifests/image.pp +++ b/manifests/image.pp @@ -88,6 +88,17 @@ class cloud::image( $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_password = uriescape($glance_db_password) @@ -117,6 +128,8 @@ class cloud::image( keystone_tenant => 'services', keystone_user => 'glance', bind_host => $api_eth, + log_dir => $log_dir, + log_file => $log_file_registry, bind_port => $ks_glance_registry_internal_port, use_syslog => $use_syslog, log_facility => $log_facility,