setup-all-dchroots: move all main code to after function declarations

[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 496054c..c504725 100644 (file)
--- a/modules/ferm/templates/interfaces.conf.erb
+++ b/modules/ferm/templates/interfaces.conf.erb
@@ -1,13 +1,13 @@
 def $MUNIN_IPS = (<%=
 begin
-       scope.lookupvar('::v4ips').split(',').join(' ')
+       scope.lookupvar('site::nodeinfo')['misc']['v4addrs'].join(' ')
 rescue
        ''
 end
 %>);
 def $MUNIN6_IPS = (<%=
 begin
-       scope.lookupvar('::v6ips') == '' ? '' : scope.lookupvar('::v6ips').split(',').join(' ')
+       scope.lookupvar('site::nodeinfo')['misc']['v6addrs'].join(' ')
 rescue
        ''
 end