From e59aec0fadd435cff42dceeb147d4eb85fdc9484 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 13 Jun 2012 21:23:36 -0300
Subject: take hiera out of the params

---
 manifests/master/hasdb.pp       | 4 ++--
 manifests/master/hasdb/mysql.pp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'manifests/master')

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, } }
diff --git a/manifests/master/hasdb/mysql.pp b/manifests/master/hasdb/mysql.pp
index bc15756..5f4985a 100644
--- a/manifests/master/hasdb/mysql.pp
+++ b/manifests/master/hasdb/mysql.pp
@@ -23,7 +23,7 @@ define puppet::master::hasdb::mysql (
     tag => "mysql_${dbhostfqdn}",
   }
 
-  if hiera('use_munin',false) {
+  if $puppet::master::manage_munin {
     munin::plugin::deploy { 'puppetresources':
       source => "puppet/munin/puppetresources.mysql",
       config => "env.mysqlopts --user=$dbuser --password=$dbpwd -h $dbhost\nenv.puppetdb $dbname",
-- 
cgit v1.2.3