Don't use `UNDEF' default values

This commit is contained in:
Alexander Klimov 2014-08-05 11:48:25 +02:00
parent 261a5dd43d
commit 8f23f61e00
2 changed files with 12 additions and 18 deletions

View File

@ -8,9 +8,15 @@ Exec { path => '/bin:/usr/bin:/sbin' }
$icingaVersion = '1.11.2' $icingaVersion = '1.11.2'
$icinga2Version = '2.0.0' $icinga2Version = '2.0.0'
mysql::database { 'icinga': } mysql::database { 'icinga':
username => 'icinga',
password => 'icinga',
}
mysql::database { 'icinga2': } mysql::database { 'icinga2':
username => 'icinga2',
password => 'icinga2',
}
exec{ 'create-pgsql-icinga-db': exec{ 'create-pgsql-icinga-db':
unless => 'sudo -u postgres psql -tAc "SELECT 1 FROM pg_roles WHERE rolname=\'icinga\'" | grep -q 1', unless => 'sudo -u postgres psql -tAc "SELECT 1 FROM pg_roles WHERE rolname=\'icinga\'" | grep -q 1',

View File

@ -1,23 +1,11 @@
define mysql::database ( define mysql::database ($username, $password) {
$username = 'UNDEF',
$password = 'UNDEF'
) {
include mysql include mysql
$user = $username ? {
/UNDEF/ => $name,
default => $username,
}
$pass = $password ? {
/UNDEF/ => $user,
default => $password,
}
exec { "create-mysql-${name}-db": exec { "create-mysql-${name}-db":
unless => "mysql -u${user} -p${pass} ${name}", unless => "mysql -u${username} -p${password} ${name}",
command => "mysql -uroot -e \"CREATE DATABASE ${name}; \ command => "mysql -uroot -e \"CREATE DATABASE ${name}; \
GRANT SELECT,INSERT,UPDATE,DELETE ON ${name}.* TO ${user}@localhost \ GRANT SELECT,INSERT,UPDATE,DELETE ON ${name}.* TO ${username}@localhost \
IDENTIFIED BY '${pass}';\"", IDENTIFIED BY '${password}';\"",
require => Service['mysqld'] require => Service['mysqld']
} }
} }