Merge pull request #698 from mhaskel/MODULES-1928

MODULES-1928 - allow log-error to be undef
xbezdick · Apr 14, 2015 · 97c9eea · 97c9eea
2 parents eb3fa4e + 298242e
commit 97c9eea
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
@@ -18,10 +18,12 @@
     $mysqluser = $options['mysqld']['user']
   }
 
-  file { $options['mysqld']['log-error']:
-    ensure => present,
-    owner  => $mysqluser,
-    group  => $::mysql::server::mysql_group,
+  if $options['mysqld']['log-error'] {
+    file { $options['mysqld']['log-error']:
+      ensure => present,
+      owner  => $mysqluser,
+      group  => $::mysql::server::mysql_group,
+    }
   }
 
   service { 'mysqld':

diff --git a/spec/acceptance/mysql_server_spec.rb b/spec/acceptance/mysql_server_spec.rb
@@ -51,5 +51,18 @@ class { 'mysql::server':
       apply_manifest(pp, :catch_changes => true)
     end
   end
+
+  describe 'configuration needed for syslog' do
+    it 'should work with no errors' do
+      pp = <<-EOS
+        class { 'mysql::server':
+          override_options => { 'mysqld' => { 'log-error' => undef }, 'mysqld_safe' => { 'log-error' => false, 'syslog' => true }},
+        }
+      EOS
+
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
+    end
+  end
 end