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

take hiera out of the params

Browse source
This commit is contained in:
mh 2012-06-14 14:53:44 -03:00
parent 01ab6a5315
commit 956edf58cc
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
manifests/server.pp
View file

@ -1,7 +1,10 @@
class mysql::server ( class mysql::server (
$manage_shorewall = false, $manage_shorewall = false,
$manage_munin = false, $manage_munin = false,
$manage_nagios = false $manage_nagios = false,
$backup_cron = false,
$optimize_cron = false,
$nagios_notcp = false
) { ) {
case $::operatingsystem { case $::operatingsystem {
gentoo: { include mysql::server::gentoo } gentoo: { include mysql::server::gentoo }

4
manifests/server/base.pp
View file

@ -57,11 +57,11 @@ class mysql::server::base {
refreshonly => true, refreshonly => true,
} }
if hiera('mysql_backup_cron',false) { if $mysql::server::backup_cron {
include mysql::server::cron::backup include mysql::server::cron::backup
} }
if hiera('mysql_optimize_cron',false) { if $mysql::server::optimize_cron {
include mysql::server::cron::optimize include mysql::server::cron::optimize
} }

7
manifests/server/nagios.pp
View file

@ -1,16 +1,15 @@
class mysql::server::nagios { class mysql::server::nagios {
# Flip this variable if you need to check MySQL through check_ssh or check_nrpe, # Flip this variable if you need to check MySQL through check_ssh or check_nrpe,
# in that case you will have to manually define nagios::service::mysql # in that case you will have to manually define nagios::service::mysql
if (hiera('nagios_mysql_notcp',false) != true) { if $mysql::server::nagios_notcp {
$nagios_mysql_user = 'nagios@localhost'
} else {
$nagios_mysql_user = 'nagios@%' $nagios_mysql_user = 'nagios@%'
nagios::service::mysql { 'connection-time': nagios::service::mysql { 'connection-time':
check_hostname => $::fqdn, check_hostname => $::fqdn,
require => Mysql_grant[$nagios_mysql_user], require => Mysql_grant[$nagios_mysql_user],
} }
} }
else {
$nagios_mysql_user = 'nagios@localhost'
}
mysql_user{$nagios_mysql_user: mysql_user{$nagios_mysql_user:
password_hash => trocla("mysql_nagios_${::fqdn}",'mysql','length: 32'), password_hash => trocla("mysql_nagios_${::fqdn}",'mysql','length: 32'),