From 51d66a53abf907f14aa9893f239af6fe5a722d6c Mon Sep 17 00:00:00 2001 From: Travis Fields Date: Thu, 19 Feb 2015 10:55:24 -0800 Subject: [PATCH] Fix lint issues due to merging of PR #649 --- manifests/backup/mysqlbackup.pp | 2 +- manifests/server/backup.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/backup/mysqlbackup.pp b/manifests/backup/mysqlbackup.pp index b2ef286..a3a7222 100644 --- a/manifests/backup/mysqlbackup.pp +++ b/manifests/backup/mysqlbackup.pp @@ -84,7 +84,7 @@ class mysql::backup::mysqlbackup ( 'password' => $backuppassword, } } - $options = mysql_deepmerge($default_options, $override_options) + $options = mysql_deepmerge($default_options, $mysql::server::override_options) file { 'mysqlbackup-config-file': path => '/etc/mysql/conf.d/meb.cnf', diff --git a/manifests/server/backup.pp b/manifests/server/backup.pp index 9d9dd5b..e2cac2f 100644 --- a/manifests/server/backup.pp +++ b/manifests/server/backup.pp @@ -19,7 +19,7 @@ class mysql::server::backup ( $provider = 'mysqldump', ) { - create_resources("class", { + create_resources('class', { "mysql::backup::${provider}" => { 'backupuser' => $backupuser, 'backuppassword' => $backuppassword,