From 7355b03ca9dde9be6e44f75934cad999942f3a98 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Wed, 29 Jan 2014 10:41:06 +0100 Subject: [PATCH] [compute] Add syslog mgmt and facility through params Refs: GH-78 --- manifests/compute.pp | 17 ++++++++++++++--- spec/classes/cloud_compute_controller_spec.rb | 6 +++++- spec/classes/cloud_compute_hypervisor_spec.rb | 6 +++++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/manifests/compute.pp b/manifests/compute.pp index 73a54c0a..13164d44 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -55,7 +55,14 @@ # (optional) Set log output to debug output # Default value in params # - +# [*use_syslog*] +# (optional) Use syslog for logging +# Defaults value in params +# +# [*log_facility*] +# (optional) Syslog facility to receive log lines +# Defaults value in params +# class cloud::compute( $nova_db_host = $os_params::nova_db_host, $nova_db_user = $os_params::nova_db_user, @@ -65,7 +72,9 @@ class cloud::compute( $ks_glance_internal_host = $os_params::ks_glance_internal_host, $glance_api_port = $os_params::ks_glance_api_internal_port, $verbose = $os_params::verbose, - $debug = $os_params::debug + $debug = $os_params::debug, + $use_syslog = $os_params::nova_use_syslog, + $log_facility = $os_params::nova_log_facility ) { if !defined(Resource['nova_config']) { @@ -84,7 +93,9 @@ class cloud::compute( rabbit_password => $rabbit_password, glance_api_servers => "http://${ks_glance_internal_host}:${glance_api_port}", verbose => $verbose, - debug => $debug + debug => $debug, + log_facility => $log_facility, + use_syslog => $use_syslog } nova_config { diff --git a/spec/classes/cloud_compute_controller_spec.rb b/spec/classes/cloud_compute_controller_spec.rb index 73ca45c0..cf7dc447 100644 --- a/spec/classes/cloud_compute_controller_spec.rb +++ b/spec/classes/cloud_compute_controller_spec.rb @@ -32,7 +32,9 @@ describe 'cloud::compute::controller' do ks_glance_internal_host => '10.0.0.1', glance_api_port => '9292', verbose => true, - debug => true }" + debug => true, + use_syslog => true, + log_facility => 'LOG_LOCAL0' }" end let :params do @@ -50,6 +52,8 @@ describe 'cloud::compute::controller' do should contain_class('nova').with( :verbose => true, :debug => true, + :use_syslog => true, + :log_facility => 'LOG_LOCAL0', :rabbit_userid => 'nova', :rabbit_hosts => ['10.0.0.1'], :rabbit_password => 'secrete', diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index ba24e17b..0054ef7e 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -32,7 +32,9 @@ describe 'cloud::compute::hypervisor' do ks_glance_internal_host => '10.0.0.1', glance_api_port => '9292', verbose => true, - debug => true }" + debug => true, + use_syslog => true, + log_facility => 'LOG_LOCAL0' }" end let :params do @@ -49,6 +51,8 @@ describe 'cloud::compute::hypervisor' do should contain_class('nova').with( :verbose => true, :debug => true, + :use_syslog => true, + :log_facility => 'LOG_LOCAL0', :rabbit_userid => 'nova', :rabbit_hosts => ['10.0.0.1'], :rabbit_password => 'secrete',