Merge pull request #687 from igalic/provider-regr

Morgan Haskel · Morgan Haskel · commit c2ec74b1b5bf · 2015-04-08T15:35:25.000-07:00
mysql backup: fix regression in mysql_user call
diff --git a/manifests/backup/mysqlbackup.pp b/manifests/backup/mysqlbackup.pp
@@ -21,7 +21,6 @@
   mysql_user { "${backupuser}@localhost":
     ensure        => $ensure,
     password_hash => mysql_password($backuppassword),
-    provider      => 'mysql',
     require       => Class['mysql::server::root_password'],
   }
 
diff --git a/manifests/backup/mysqldump.pp b/manifests/backup/mysqldump.pp
@@ -21,7 +21,6 @@
   mysql_user { "${backupuser}@localhost":
     ensure        => $ensure,
     password_hash => mysql_password($backuppassword),
-    provider      => 'mysql',
     require       => Class['mysql::server::root_password'],
   }
 
diff --git a/manifests/backup/xtrabackup.pp b/manifests/backup/xtrabackup.pp
@@ -22,7 +22,6 @@
   mysql_user { "${backupuser}@localhost":
     ensure        => $ensure,
     password_hash => mysql_password($backuppassword),
-    provider      => 'mysql',
     require       => Class['mysql::server::root_password'],
   }
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`mysql_user { "${backupuser}@localhost":`
`22`	`22`	`ensure => $ensure,`
`23`	`23`	`password_hash => mysql_password($backuppassword),`
`24`		`- provider => 'mysql',`
`25`	`24`	`require => Class['mysql::server::root_password'],`
`26`	`25`	`}`
`27`	`26`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`mysql_user { "${backupuser}@localhost":`
`23`	`23`	`ensure => $ensure,`
`24`	`24`	`password_hash => mysql_password($backuppassword),`
`25`		`- provider => 'mysql',`
`26`	`25`	`require => Class['mysql::server::root_password'],`
`27`	`26`	`}`
`28`	`27`