opuppet/module-puppetlabs-mysql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix show_diff already set on .my.cnf

Browse source 
show_diff is set twice on .my.cnf causing compilation error:

Parameter 'show_diff' is already set on File[/.my.cnf]

This patch removes one of them
This commit is contained in:
Michael Chapman 2015-08-05 14:56:28 +10:00
parent c7de52013b
commit 0dffab2923
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
manifests/server/root_password.pp
View file

@ -12,21 +12,12 @@ class mysql::server::root_password {
}
if $mysql::server::create_root_my_cnf == true and $mysql::server::root_password != 'UNSET' {
# 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',
}
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 }