(maint) don't print diff root password in diff
For puppet versions that support it, suppress diffing root's password.
This commit is contained in:
parent
fd03318331
commit
8f628b8d73
2 changed files with 5 additions and 0 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -7,3 +7,4 @@ spec/fixtures/
|
||||||
coverage/
|
coverage/
|
||||||
.idea/
|
.idea/
|
||||||
*.iml
|
*.iml
|
||||||
|
log/
|
||||||
|
|
|
@ -17,6 +17,10 @@ class mysql::server::root_password {
|
||||||
owner => 'root',
|
owner => 'root',
|
||||||
mode => '0600',
|
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 {
|
if $mysql::server::create_root_user == true {
|
||||||
Mysql_user['root@localhost'] -> File["${::root_home}/.my.cnf"]
|
Mysql_user['root@localhost'] -> File["${::root_home}/.my.cnf"]
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue