diff options
author | mh <mh@immerda.ch> | 2012-06-13 21:23:36 -0300 |
---|---|---|
committer | mh <mh@immerda.ch> | 2012-06-13 21:23:36 -0300 |
commit | e59aec0fadd435cff42dceeb147d4eb85fdc9484 (patch) | |
tree | edbef76b28d5dfec1d17df0cb25624c496b1e6a8 /manifests/master/hasdb.pp | |
parent | aa345cb8f784ce5441367db7c4782000d80d365b (diff) |
take hiera out of the params
Diffstat (limited to 'manifests/master/hasdb.pp')
-rw-r--r-- | manifests/master/hasdb.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/master/hasdb.pp b/manifests/master/hasdb.pp index d3bf388..66aeb62 100644 --- a/manifests/master/hasdb.pp +++ b/manifests/master/hasdb.pp @@ -5,11 +5,11 @@ define puppet::master::hasdb ( # this is needed due to the collection of the databases $dbhostfqdn = $::fqdn, $dbuser = 'puppet', - $dbpwd = hiera('puppet_master_storeconfigs_password',false), + $dbpwd = false, $dbconnectinghost = 'locahost' ) { - if !$dbpwd { fail("No \$puppet_master_storeconfig_password is set, please set it in your hiera database") } + if !$dbpwd { fail('No $puppet_master_storeconfig_password is set, please pass it the master class') } case $dbtype { 'mysql': { puppet::master::hasdb::mysql{$name: dbname => $dbname, dbhost => $dbhost, dbuser => $dbuser, dbpwd => $dbpwd, } } |