From c9fe18855805193068a55f160f4695b09f452789 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 25 Jan 2013 16:16:09 -0200
Subject: Minor fixes at nodo::master

---
 manifests/master.pp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'manifests/master.pp')

diff --git a/manifests/master.pp b/manifests/master.pp
index df1f7d9..1285f57 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -1,8 +1,12 @@
 class nodo::master {
-  $main_master        = hiera('nodo::master::main', false)
-  $master_db_password = hiera('nodo::master::db_password', '')
+  $main        = hiera('nodo::master::main',        false)
+  $db_password = hiera('nodo::master::db_password', '')
 
-  if $main_master == true {
+  case $db_password {
+    '': { fail("Please set nodo::master::db_password in your config") }
+  }
+
+  if $main == true {
     # Puppetmaster should be included before nodo::vserver
     class { 'puppet::master':
       main => true,
@@ -41,10 +45,6 @@ class nodo::master {
     ensure => absent,
   }
 
-  case $master_db_password {
-    '': { fail("Please set nodo::master::db_password in your config") }
-  }
-
   # Update master's puppet.conf if you change here
   database::instance { "puppet":
     password => "$db_password",
-- 
cgit v1.2.3