Make openstack module tests work under puppet 4

This change updates the rsyslog default for the custom config option to
be '' rather than undef so that the correct file is used for the client
and service configurations under puppet 4. Additionally this change
fixes the parameter check for rabbit_hosts for the openstack module so
that it passes.

Change-Id: I128abd4cc27297d76db8f6d05e583cfbeae8abc7
Closes-Bug: #1507614
This commit is contained in:
Alex Schultz 2015-10-19 09:47:43 -05:00
parent 56f55f373a
commit 1005f86180
5 changed files with 4 additions and 3 deletions

View File

@ -3,3 +3,4 @@ pkg/
.DS_Store
metadata.json
coverage/
spec/fixtures

View File

@ -101,7 +101,7 @@ describe 'openstack::compute' do
:ensure_package => 'present',
:database_backend => p[:database_backend],
:rpc_backend => p[:rpc_backend],
:rabbit_hosts => params[:amqp_hosts],
:rabbit_hosts => [ params[:amqp_hosts] ],
:rabbit_userid => p[:amqp_user],
:rabbit_password => p[:amqp_password],
:kombu_reconnect_delay => '5.0',

View File

@ -7,7 +7,7 @@ class rsyslog::client (
$remote_type = 'tcp',
$log_local = false,
$log_auth_local = false,
$custom_config = undef,
$custom_config = '',
$server = 'log',
$escapenewline = false,
) inherits rsyslog {

View File

@ -6,7 +6,7 @@ class rsyslog::server (
$enable_tcp = true,
$enable_udp = true,
$server_dir = '/srv/log/',
$custom_config = undef,
$custom_config = '',
$high_precision_timestamps = false,
$escapenewline = false,
$port = '514',