stackforge/puppet-openstack-cloud
Code Issues Proposed changes

[compute] Add syslog mgmt and facility through params

Browse Source 
Refs: GH-78
This commit is contained in:
Sebastien Badia
2014-01-29 10:41:06 +01:00
parent eb5e9dfc8c
commit 7355b03ca9
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/compute.pp
View File

@@ -55,7 +55,14 @@
# (optional) Set log output to debug output # (optional) Set log output to debug output
# Default value in params # 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( class cloud::compute(
$nova_db_host = $os_params::nova_db_host, $nova_db_host = $os_params::nova_db_host,
$nova_db_user = $os_params::nova_db_user, $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, $ks_glance_internal_host = $os_params::ks_glance_internal_host,
$glance_api_port = $os_params::ks_glance_api_internal_port, $glance_api_port = $os_params::ks_glance_api_internal_port,
$verbose = $os_params::verbose, $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']) { if !defined(Resource['nova_config']) {
@@ -84,7 +93,9 @@ class cloud::compute(
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
glance_api_servers => "http://${ks_glance_internal_host}:${glance_api_port}", glance_api_servers => "http://${ks_glance_internal_host}:${glance_api_port}",
verbose => $verbose, verbose => $verbose,
debug => $debug debug => $debug,
log_facility => $log_facility,
use_syslog => $use_syslog
} }
nova_config { nova_config {

6
spec/classes/cloud_compute_controller_spec.rb
View File

@@ -32,7 +32,9 @@ describe 'cloud::compute::controller' do
ks_glance_internal_host => '10.0.0.1', ks_glance_internal_host => '10.0.0.1',
glance_api_port => '9292', glance_api_port => '9292',
verbose => true, verbose => true,
debug => true }" debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end end
let :params do let :params do
@@ -50,6 +52,8 @@ describe 'cloud::compute::controller' do
should contain_class('nova').with( should contain_class('nova').with(
:verbose => true, :verbose => true,
:debug => true, :debug => true,
:use_syslog => true,
:log_facility => 'LOG_LOCAL0',
:rabbit_userid => 'nova', :rabbit_userid => 'nova',
:rabbit_hosts => ['10.0.0.1'], :rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete', :rabbit_password => 'secrete',

6
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@@ -32,7 +32,9 @@ describe 'cloud::compute::hypervisor' do
ks_glance_internal_host => '10.0.0.1', ks_glance_internal_host => '10.0.0.1',
glance_api_port => '9292', glance_api_port => '9292',
verbose => true, verbose => true,
debug => true }" debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end end
let :params do let :params do
@@ -49,6 +51,8 @@ describe 'cloud::compute::hypervisor' do
should contain_class('nova').with( should contain_class('nova').with(
:verbose => true, :verbose => true,
:debug => true, :debug => true,
:use_syslog => true,
:log_facility => 'LOG_LOCAL0',
:rabbit_userid => 'nova', :rabbit_userid => 'nova',
:rabbit_hosts => ['10.0.0.1'], :rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete', :rabbit_password => 'secrete',