stackforge/puppet-openstack-cloud
Code Issues Proposed changes

identity: disable log_file param when using syslog

Browse Source 
When using syslog, ensure that log_file is empty to avoid multiple
logging.

Close bug #360

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-03-13 17:19:21 +01:00
parent 029e0dea92
commit 6437be00d3
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/identity.pp
View File

@@ -404,6 +404,9 @@ class cloud::identity (
# Disable twice logging if syslog is enabled # Disable twice logging if syslog is enabled
if $use_syslog { if $use_syslog {
$log_dir = false $log_dir = false
keystone_config {
'DEFAULT/log_file': ensure => absent;
}
} else { } else {
$log_dir = '/var/log/keystone' $log_dir = '/var/log/keystone'
} }

1
spec/classes/cloud_identity_spec.rb
View File

@@ -115,6 +115,7 @@ describe 'cloud::identity' do
:log_dir => false :log_dir => false
) )
should contain_keystone_config('ec2/driver').with('value' => 'keystone.contrib.ec2.backends.sql.Ec2') should contain_keystone_config('ec2/driver').with('value' => 'keystone.contrib.ec2.backends.sql.Ec2')
should contain_keystone_config('DEFAULT/log_file').with_ensure('absent')
end end
it 'checks if Keystone DB is populated' do it 'checks if Keystone DB is populated' do