Skip to content

Commit

Permalink
Don't use `UNDEF' default values
Browse files Browse the repository at this point in the history
  • Loading branch information
Al2Klimov committed Aug 5, 2014
1 parent 261a5dd commit 8f23f61
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 18 deletions.
10 changes: 8 additions & 2 deletions .vagrant-puppet/manifests/default.pp
Expand Up @@ -8,9 +8,15 @@
$icingaVersion = '1.11.2'
$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':
unless => 'sudo -u postgres psql -tAc "SELECT 1 FROM pg_roles WHERE rolname=\'icinga\'" | grep -q 1',
Expand Down
20 changes: 4 additions & 16 deletions .vagrant-puppet/modules/mysql/manifests/database.pp
@@ -1,23 +1,11 @@
define mysql::database (
$username = 'UNDEF',
$password = 'UNDEF'
) {
define mysql::database ($username, $password) {
include mysql

$user = $username ? {
/UNDEF/ => $name,
default => $username,
}
$pass = $password ? {
/UNDEF/ => $user,
default => $password,
}

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}; \
GRANT SELECT,INSERT,UPDATE,DELETE ON ${name}.* TO ${user}@localhost \
IDENTIFIED BY '${pass}';\"",
GRANT SELECT,INSERT,UPDATE,DELETE ON ${name}.* TO ${username}@localhost \
IDENTIFIED BY '${password}';\"",
require => Service['mysqld']
}
}

0 comments on commit 8f23f61

Please sign in to comment.