diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 16:16:09 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 16:16:09 -0200 |
| commit | c9fe18855805193068a55f160f4695b09f452789 (patch) | |
| tree | 2f84c5be3286b9df8fcd0b79581a6be4a7a4b81c /manifests | |
| parent | 86d03609aa0e8cafdce86a0e3d5734518cbf8071 (diff) | |
| download | puppet-nodo-c9fe18855805193068a55f160f4695b09f452789.tar.gz puppet-nodo-c9fe18855805193068a55f160f4695b09f452789.tar.bz2 | |
Minor fixes at nodo::master
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/master.pp | 14 |
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", |