Merge "if log_file enabled, ensure log_dir is not absent"

redhat-openstack · Mar 28, 2014 · ad61ad3 · ad61ad3
2 parents 3425620 + 74a6f0a
commit ad61ad3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -220,8 +220,8 @@
 
   if $log_file {
     neutron_config {
-      'DEFAULT/log_file': value  => $log_file;
-      'DEFAULT/log_dir':  ensure => absent;
+      'DEFAULT/log_file': value => $log_file;
+      'DEFAULT/log_dir':  value => $log_dir;
     }
   } else {
     if $log_dir {

diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb
@@ -164,12 +164,13 @@
   shared_examples_for 'with log_file specified' do
     before do
       params.merge!(
-        :log_file => '/var/log/neutron/server.log'
+        :log_file => '/var/log/neutron/server.log',
+        :log_dir  => '/tmp/log/neutron'
       )
     end
     it 'configures logging' do
       should contain_neutron_config('DEFAULT/log_file').with_value(params[:log_file])
-      should contain_neutron_config('DEFAULT/log_dir').with_ensure('absent')
+      should contain_neutron_config('DEFAULT/log_dir').with_value(params[:log_dir])
     end
   end