stackforge/puppet-openstack-cloud
Code Issues Proposed changes

[image] Export syslog mgmt and facility through params

Browse Source 
Refs: GH-78
This commit is contained in:
Sebastien Badia 2014-01-29 12:04:23 +01:00
parent 59ac4e73ed
commit bf689225cf
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/image.pp
View File

@ -59,7 +59,14 @@
# (optional) Which interface we bind the Glance API server. # (optional) Which interface we bind the Glance API server.
# 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::image( class cloud::image(
$glance_db_host = $os_params::glance_db_host, $glance_db_host = $os_params::glance_db_host,
$glance_db_user = $os_params::glance_db_user, $glance_db_user = $os_params::glance_db_user,
@ -77,6 +84,8 @@ class cloud::image(
$rbd_store_user = $os_params::glance_rbd_user, $rbd_store_user = $os_params::glance_rbd_user,
$verbose = $os_params::verbose, $verbose = $os_params::verbose,
$debug = $os_params::debug $debug = $os_params::debug
$log_facility = $os_params::log_facility,
$use_syslog = $os_params::use_syslog
) { ) {
$encoded_glance_user = uriescape($glance_db_user) $encoded_glance_user = uriescape($glance_db_user)
@ -92,8 +101,9 @@ class cloud::image(
keystone_password => $ks_glance_password, keystone_password => $ks_glance_password,
keystone_tenant => 'services', keystone_tenant => 'services',
keystone_user => 'glance', keystone_user => 'glance',
log_facility => 'LOG_LOCAL0', log_facility => $log_facility,
bind_host => $api_eth, bind_host => $api_eth,
<<<<<<< HEAD
bind_port => $ks_glance_api_internal_port, bind_port => $ks_glance_api_internal_port,
use_syslog => true use_syslog => true
} }
@ -110,6 +120,11 @@ class cloud::image(
bind_host => $api_eth, bind_host => $api_eth,
bind_port => $ks_glance_registry_internal_port, bind_port => $ks_glance_registry_internal_port,
use_syslog => true use_syslog => true
||||||| merged common ancestors
use_syslog => true
=======
use_syslog => $use_syslog,
>>>>>>> [image] Export syslog mgmt and facility through params
} }
class { 'glance::notify::rabbitmq': class { 'glance::notify::rabbitmq':

3
spec/classes/cloud_image_spec.rb
View File

@ -15,7 +15,6 @@
# #
# Unit tests for cloud::image class # Unit tests for cloud::image class
# #
require 'spec_helper' require 'spec_helper'
describe 'cloud::image' do describe 'cloud::image' do
@ -38,6 +37,8 @@ describe 'cloud::image' do
:rbd_store_pool => 'images', :rbd_store_pool => 'images',
:debug => true, :debug => true,
:verbose => true, :verbose => true,
:use_syslog => true,
:log_facility => 'LOG_LOCAL0',
:api_eth => '10.0.0.1' } :api_eth => '10.0.0.1' }
end end