diff options
Diffstat (limited to 'manifests/base/virtual.pp')
-rw-r--r-- | manifests/base/virtual.pp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/manifests/base/virtual.pp b/manifests/base/virtual.pp index f2c72f1..5e86e42 100644 --- a/manifests/base/virtual.pp +++ b/manifests/base/virtual.pp @@ -10,25 +10,8 @@ class nodo::base::virtual { dohwinfo => false, } - $hosting_type = hiera('nodo::vserver::hosting_type', 'direct') - - case $hosting_type { - "direct": { - # Apply munin and monkeysphere configuration for - # for directly hosted nodes. - Nodo::Subsystem::Monitor::Munin <<| title == $::hostname |>> - Nodo::Subsystem::Monkeysphere <<| title == $::hostname |>> - } - "third-party": { - # Apply munin and monkeysphere configuration for - # nodes hosted by third-parties. - nodo::subsystem::monitor::munin { "${::hostname}": } - monkeysphere_host { "${::hostname}": - port => hiera('nodo::vserver::ssh_port', '22'), - } - - # Nagios configuration - class { 'nodo::subsystem::monitor': } - } + nodo::subsystem::monitor::munin { "${::hostname}": } + monkeysphere_host { "${::hostname}": + port => hiera('nodo::vserver::ssh_port', '22'), } } |