diff options
Diffstat (limited to 'manifests/server/munin')
| -rw-r--r-- | manifests/server/munin/default.pp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/manifests/server/munin/default.pp b/manifests/server/munin/default.pp index 04902b2..acdaabb 100644 --- a/manifests/server/munin/default.pp +++ b/manifests/server/munin/default.pp @@ -2,27 +2,24 @@ class mysql::server::munin::default { mysql_user{'munin@localhost': password_hash => trocla("mysql_munin_${::fqdn}",'mysql','length: 32'), - require => Package['mysql'], + require => Exec['mysql_set_rootpw'], } mysql_grant{'munin@localhost': privileges => 'select_priv', - require => [ Mysql_user['munin@localhost'], Package['mysql'] ], + require => Mysql_user['munin@localhost'], } $munin_mysql_password = trocla("mysql_munin_${::fqdn}",'plain', 'length: 32') munin::plugin { [mysql_bytes, mysql_queries, mysql_slowqueries, mysql_threads]: config => "env.mysqlopts --user=munin --password='${munin_mysql_password}' -h localhost", - require => [ Mysql_grant['munin@localhost'], Mysql_user['munin@localhost'], Package['mysql'] ] + require => Mysql_grant['munin@localhost'], } Munin::Plugin::Deploy{ config => "env.mysqlopts --user=munin --password='${munin_mysql_password}' -h localhost", - require => - [ Mysql_grant['munin@localhost'], - Mysql_user['munin@localhost'], - Package['mysql'] ] + require => Mysql_grant['munin@localhost'], } munin::plugin::deploy{ 'mysql_connections': |