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

Fix lint issues due to merging of PR #649

Browse source
This commit is contained in:
Travis Fields 2015-02-19 10:55:24 -08:00
parent cb142f414d
commit 51d66a53ab
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/backup/mysqlbackup.pp
View file

@ -84,7 +84,7 @@ class mysql::backup::mysqlbackup (
'password' => $backuppassword, 'password' => $backuppassword,
} }
} }
$options = mysql_deepmerge($default_options, $override_options) $options = mysql_deepmerge($default_options, $mysql::server::override_options)
file { 'mysqlbackup-config-file': file { 'mysqlbackup-config-file':
path => '/etc/mysql/conf.d/meb.cnf', path => '/etc/mysql/conf.d/meb.cnf',

2
manifests/server/backup.pp
View file

@ -19,7 +19,7 @@ class mysql::server::backup (
$provider = 'mysqldump', $provider = 'mysqldump',
) { ) {
create_resources("class", { create_resources('class', {
"mysql::backup::${provider}" => { "mysql::backup::${provider}" => {
'backupuser' => $backupuser, 'backupuser' => $backupuser,
'backuppassword' => $backuppassword, 'backuppassword' => $backuppassword,