From 09c8eaf304d1075980d8d9143545f2f16a1db34d Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Tue, 5 Jun 2012 18:59:39 -0300
Subject: new style for 2.7

---
 manifests/master/hasdb.pp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 manifests/master/hasdb.pp

(limited to 'manifests/master/hasdb.pp')

diff --git a/manifests/master/hasdb.pp b/manifests/master/hasdb.pp
new file mode 100644
index 0000000..d3bf388
--- /dev/null
+++ b/manifests/master/hasdb.pp
@@ -0,0 +1,17 @@
+define puppet::master::hasdb (
+  $dbtype = 'mysql',
+  $dbname = 'puppet',
+  $dbhost = 'localhost',
+  # this is needed due to the collection of the databases
+  $dbhostfqdn = $::fqdn,
+  $dbuser = 'puppet',
+  $dbpwd = hiera('puppet_master_storeconfigs_password',false),
+  $dbconnectinghost = 'locahost'
+) {
+
+  if !$dbpwd { fail("No \$puppet_master_storeconfig_password is set, please set it in your hiera database") }
+
+  case $dbtype {
+    'mysql': {  puppet::master::hasdb::mysql{$name: dbname => $dbname, dbhost => $dbhost, dbuser => $dbuser, dbpwd => $dbpwd, } }
+  }
+}
-- 
cgit v1.2.3


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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/master/hasdb.pp')

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, } }
-- 
cgit v1.2.3