Munin conditionals at nodo::role::nas

diff --git a/manifests/role/nas.pp b/manifests/role/nas.pp
index 536f9ca2ea7268e1e929dc5d733967739b8752d2..a0a4c3deaa8b4818d70ceb0b6cc548048edf7b81 100644 (file)
--- a/manifests/role/nas.pp
+++ b/manifests/role/nas.pp
@@ -82,11 +82,10 @@ class nodo::role::nas(
       server => true;
     }
 
-    munin::plugin { [ 'nfsd4' ]:
-      ensure => $munin ? {
-        true    => present,
-        default => absent,
-      },
+    if $munin == true {
+      munin::plugin { [ 'nfsd4' ]:
+        ensure => present,
+      }
     }
   }
 
@@ -192,11 +191,10 @@ class nodo::role::nas(
       },
     }
 
-    munin::plugin { [ 'samba' ]:
-      ensure => $munin ? {
-        true    => present,
-        default => absent,
-      },
+    if $munin == true {
+      munin::plugin { [ 'samba' ]:
+        ensure => present,
+      }
     }
   }
 

diff --git a/manifests/subsystem/nas/share.pp b/manifests/subsystem/nas/share.pp
index aee32f2b57093475dd3d9882a6640f14df31e4d7..a5cac93951308f10aa82aa90278905ad72c4251a 100644 (file)
--- a/manifests/subsystem/nas/share.pp
+++ b/manifests/subsystem/nas/share.pp
@@ -102,7 +102,7 @@ define nodo::subsystem::nas::share(
   #
   $avahi = hiera('nodo::role::nas::avahi', false)
 
-  if $avahi == true {
+  if $avahi == true and $nfs == true {
     file { "/etc/avahi/services/nfs-${name}.service":
       ensure => present,
       owner  => root,