1 files changed, 12 insertions, 14 deletions
diff --git a/manifests/puppetmaster/hasdb.pp b/manifests/puppetmaster/hasdb.pp
index 82bbe47..1ba1331 100644
--- a/manifests/puppetmaster/hasdb.pp
+++ b/manifests/puppetmaster/hasdb.pp
@@ -1,19 +1,17 @@
 define puppet::puppetmaster::hasdb(
-    $dbtype = 'mysql',
-    $dbname = 'puppet',
-    $dbhost = 'localhost',
-    # this is needed due to the collection of the databases
-    $dbhostfqdn = "${fqdn}",
-    $dbuser = 'puppet',
-    $dbpwd = $puppet_storeconfig_password,
-    $dbconnectinghost = 'locahost'
+  $dbtype = 'mysql',
+  $dbname = 'puppet',
+  $dbhost = 'localhost',
+  # this is needed due to the collection of the databases
+  $dbhostfqdn = "${fqdn}",
+  $dbuser = 'puppet',
+  $dbpwd = $puppet_storeconfig_password,
+  $dbconnectinghost = 'locahost'
 ){
 
-    case $puppet_storeconfig_password {
-        '': { fail("No \$puppet_storeconfig_password is set, please set it in your manifests or site.pp to add a password") }
-    }
+  if !$puppet_storeconfig_password { fail("No \$puppet_storeconfig_password is set, please set it in your manifests or site.pp to add a password") }
 
-    case $dbtype {
-        'mysql': {  puppet::puppetmaster::hasdb::mysql{$name: dbname => $dbname, dbhost => $dbhost, dbuser => $dbuser, dbpwd => $dbpwd, } }
-    }
+  case $dbtype {
+    'mysql': {  puppet::puppetmaster::hasdb::mysql{$name: dbname => $dbname, dbhost => $dbhost, dbuser => $dbuser, dbpwd => $dbpwd, } }
+  }
 }