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

Merge pull request #421 from blkperl/puppet36_future_parser

Browse source 
Change selector statements to have default listed last
This commit is contained in:
Ashley Penney 2014-05-22 19:17:28 -07:00
commit 7ad1390c1d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
manifests/validate_db_connection.pp
View file

@ -21,24 +21,24 @@ define postgresql::validate_db_connection(
$cmd_init = "${psql_path} --tuples-only --quiet "
$cmd_host = $database_host ? {
undef => '',
default => "-h ${database_host} ",
undef => "",
}
$cmd_user = $database_username ? {
undef => '',
default => "-U ${database_username} ",
undef => "",
}
$cmd_port = $database_port ? {
undef => '',
default => "-p ${database_port} ",
undef => "",
}
$cmd_dbname = $database_name ? {
default => "--dbname ${database_name} ",
undef => "--dbname ${postgresql::params::default_database} ",
default => "--dbname ${database_name} ",
}
$env = $database_password ? {
default => "PGPASSWORD=${database_password}",
undef => undef,
default => "PGPASSWORD=${database_password}",
}
$cmd = join([$cmd_init, $cmd_host, $cmd_user, $cmd_port, $cmd_dbname])
$validate_cmd = "/usr/local/bin/validate_postgresql_connection.sh ${sleep} ${tries} '${cmd}'"