aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/master.pp14
1 files changed, 7 insertions, 7 deletions
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",