From 0aa26f6582117c10bd311a2f81e576c5227be70f Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 13 Mar 2014 17:19:21 +0100 Subject: [PATCH] identity: disable log_file param when using syslog When using syslog, ensure that log_file is empty to avoid multiple logging. Close bug #360 Signed-off-by: Emilien Macchi --- manifests/identity.pp | 3 +++ spec/classes/cloud_identity_spec.rb | 1 + 2 files changed, 4 insertions(+) diff --git a/manifests/identity.pp b/manifests/identity.pp index e8937859..526dd308 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -404,6 +404,9 @@ class cloud::identity ( # Disable twice logging if syslog is enabled if $use_syslog { $log_dir = false + keystone_config { + 'DEFAULT/log_file': ensure => absent; + } } else { $log_dir = '/var/log/keystone' } diff --git a/spec/classes/cloud_identity_spec.rb b/spec/classes/cloud_identity_spec.rb index bdd8d05d..4ee574e0 100644 --- a/spec/classes/cloud_identity_spec.rb +++ b/spec/classes/cloud_identity_spec.rb @@ -115,6 +115,7 @@ describe 'cloud::identity' do :log_dir => false ) 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 it 'checks if Keystone DB is populated' do