merge munin_ip v4 and v6 into one rule

[mirror/dsa-puppet.git] / modules / ferm / templates / interfaces.conf.erb

diff --git a/modules/ferm/templates/interfaces.conf.erb b/modules/ferm/templates/interfaces.conf.erb
index 82bdb09..f017050 100644 (file)
--- a/modules/ferm/templates/interfaces.conf.erb
+++ b/modules/ferm/templates/interfaces.conf.erb
@@ -1,13 +1,17 @@
-def $MUNIN_IPS = (<%= v4ips.split(',').join(' ') %>);
+def $MUNIN_IPS = (<%=
+begin
+       scope.lookupvar('site::nodeinfo')['misc']['v4addrs'].join(' ')
+rescue
+       ''
+end
+%>);
+def $MUNIN_IPS = ($MUNIN_IPS <%=
+begin
+       scope.lookupvar('site::nodeinfo')['misc']['v6addrs'].join(' ')
+rescue
+       ''
+end
+%>);
 
-domain ip {
-        chain INPUT {
-               daddr ($MUNIN_IPS) NOP;
-        }
-}
-
-domain ip {
-        chain OUTPUT {
-               saddr ($MUNIN_IPS) NOP;
-        }
-}
+domain (ip ip6) { chain INPUT  { daddr ($MUNIN_IPS) NOP; } }
+domain (ip ip6) { chain OUTPUT { saddr ($MUNIN_IPS) NOP; } }