openstack/puppet-tempest
Code Issues Proposed changes

Add logging_context_format_string parameter

Browse Source 
Add logging_context_format_string so we can change log format in
tempest.

Change-Id: Ib09dbd4a800209175c065f591b7dc78ce88da709
This commit is contained in:
Emilien Macchi 2016-01-08 15:55:53 -05:00
parent e9692e3805
commit cb8000bdfa
2 changed files with 73 additions and 68 deletions
manifests
init.pp
spec/classes
tempest_spec.rb

6
manifests/init.pp

@ -49,6 +49,8 @@
# Defaults to false # Defaults to false
# [*log_file*] # [*log_file*]
# Defaults to undef # Defaults to undef
# [*logging_context_format_string*]
# Defaults to undef
# [*username*] # [*username*]
# Defaults to undef # Defaults to undef
# [*password*] # [*password*]
@ -178,6 +180,7 @@ class tempest(
$use_stderr = true, $use_stderr = true,
$use_syslog = false, $use_syslog = false,
$log_file = undef, $log_file = undef,
$logging_context_format_string = undef,
# non admin user # non admin user
$username = undef, $username = undef,
$password = undef, $password = undef,
@ -207,7 +210,7 @@ class tempest(
$allow_tenant_isolation = undef, $allow_tenant_isolation = undef,
# neutron config # neutron config
$public_network_id = undef, $public_network_id = undef,
# Upstream has a bad default - set it to empty string. # Upstream has a bad defaul t - set it to empty string.
$public_router_id = '', $public_router_id = '',
# Service configuration # Service configuration
$cinder_available = true, $cinder_available = true,
@ -344,6 +347,7 @@ class tempest(
'DEFAULT/use_stderr': value => $use_stderr; 'DEFAULT/use_stderr': value => $use_stderr;
'DEFAULT/use_syslog': value => $use_syslog; 'DEFAULT/use_syslog': value => $use_syslog;
'DEFAULT/log_file': value => $log_file; 'DEFAULT/log_file': value => $log_file;
'DEFAULT/logging_context_format_string': value => $logging_context_format_string;
'scenario/img_dir': value => $img_dir; 'scenario/img_dir': value => $img_dir;
'scenario/img_file': value => $img_file; 'scenario/img_file': value => $img_file;
'service_broker/run_service_broker_tests': value => $run_service_broker_tests; 'service_broker/run_service_broker_tests': value => $run_service_broker_tests;

1
spec/classes/tempest_spec.rb

@ -202,6 +202,7 @@ describe 'tempest' do
is_expected.to contain_tempest_config('DEFAULT/use_stderr').with(:value => true) is_expected.to contain_tempest_config('DEFAULT/use_stderr').with(:value => true)
is_expected.to contain_tempest_config('DEFAULT/use_syslog').with(:value => false) is_expected.to contain_tempest_config('DEFAULT/use_syslog').with(:value => false)
is_expected.to contain_tempest_config('DEFAULT/log_file').with(:value => nil) is_expected.to contain_tempest_config('DEFAULT/log_file').with(:value => nil)
is_expected.to contain_tempest_config('DEFAULT/logging_context_format_string').with(:value => nil)
is_expected.to contain_tempest_config('scenario/img_dir').with(:value => '/var/lib/tempest') is_expected.to contain_tempest_config('scenario/img_dir').with(:value => '/var/lib/tempest')
is_expected.to contain_tempest_config('scenario/img_file').with(:value => 'cirros-0.3.4-x86_64-disk.img') is_expected.to contain_tempest_config('scenario/img_file').with(:value => 'cirros-0.3.4-x86_64-disk.img')
is_expected.to contain_tempest_config('service_broker/run_service_broker_tests').with(:value => false) is_expected.to contain_tempest_config('service_broker/run_service_broker_tests').with(:value => false)