Merge pull request #739 from hunner/dont_print_root

Dont print root

Author: bmjen

.gitignore

@@ -7,3 +7,4 @@ spec/fixtures/
 coverage/
 .idea/
 *.iml
+log/

manifests/server/root_password.pp

@@ -12,10 +12,24 @@
   }
 
   if $mysql::server::create_root_my_cnf == true and $mysql::server::root_password != 'UNSET' {
-    file { "${::root_home}/.my.cnf":
-      content => template('mysql/my.cnf.pass.erb'),
-      owner   => 'root',
-      mode    => '0600',
+    # Puppet 2.7 doesnt support show_diff
+    if versioncmp($::puppetversion, '3.0') <= 0 {
+      file { "${::root_home}/.my.cnf":
+        content   => template('mysql/my.cnf.pass.erb'),
+        owner     => 'root',
+        mode      => '0600',
+        show_diff => false,
+      }
+    } else {
+      file { "${::root_home}/.my.cnf":
+        content => template('mysql/my.cnf.pass.erb'),
+        owner   => 'root',
+        mode    => '0600',
+      }
+    }
+    # show_diff was added with puppet 3.0
+    if versioncmp($::puppetversion, '3.0') <= 0 {
+      File["${::root_home}/.my.cnf"] { show_diff => false }
     }
     if $mysql::server::create_root_user == true {
       Mysql_user['root@localhost'] -> File["${::root_home}/.my.cnf"]