X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fferm%2Ftemplates%2Finterfaces.conf.erb;h=c504725fba976bdcf62a1599b062336fc9af98eb;hb=b0a49d0c8c18d1f3436b89c5ff5d17419e2e39f0;hp=496054c42de201af4857a70e1bf031adb56711e4;hpb=38339aa5456ff34cbc8bb5ba8b7690799d341d48;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/interfaces.conf.erb b/modules/ferm/templates/interfaces.conf.erb
index 496054c42..c504725fb 100644
--- 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