database/sql: fix clean-mysql-binlog notify

table, user and privilegs args of mysql_grant are required arguments
in 2.2 release of puppetlabs-mysql.

This commit remove alos the require on my.cnf and mysqld (this cause a
cycle dependency)
This commit is contained in:
Sebastien Badia 2014-08-06 15:11:49 +02:00
parent 3ff41fd1c0
commit 697861358c

View File

@ -247,7 +247,11 @@ class cloud::database::sql (
require => File['/root/.my.cnf']
}
mysql_grant { "${galera_clustercheck_dbuser}@localhost/monitoring":
privileges => ['ALL']
ensure => 'present',
options => ['GRANT'],
privileges => ['ALL'],
table => 'monitoring.*',
user => "${galera_clustercheck_dbuser}@localhost",
}
Database_user<<| |>>
@ -291,10 +295,6 @@ class cloud::database::sql (
# first sync take a long time
command => "/bin/bash -c '/usr/bin/mysqladmin --defaults-file=/root/.my.cnf shutdown ; /bin/rm ${::mysql::params::datadir}/ib_logfile*'",
path => '/usr/bin',
require => [
File['/root/.my.cnf'],
Service['mysqld'],
],
notify => Service['mysqld'],
refreshonly => true,
onlyif => "stat ${::mysql::params::datadir}/ib_logfile0 && test `du -sh ${::mysql::params::datadir}/ib_logfile0 | cut -f1` != '256M'",