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=fbe960266d9437ecd742599883c738d788e28f69;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/templates/interfaces.conf.erb b/modules/ferm/templates/interfaces.conf.erb index fbe960266..c504725fb 100644 --- a/modules/ferm/templates/interfaces.conf.erb +++ b/modules/ferm/templates/interfaces.conf.erb @@ -1,13 +1,13 @@ def $MUNIN_IPS = (<%= begin - v4ips.split(',').join(' ') + scope.lookupvar('site::nodeinfo')['misc']['v4addrs'].join(' ') rescue '' end %>); def $MUNIN6_IPS = (<%= begin - v6ips == '' ? '' : v6ips.split(',').join(' ') + scope.lookupvar('site::nodeinfo')['misc']['v6addrs'].join(' ') rescue '' end