scope fixes

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 03025d53533dd857a385da953ab3270ed06c619a..904d83a9a21bc261c8b99345866fc66f87c1dedd 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -24,17 +24,17 @@ class ferm {
                status      => '/bin/true',
        }
 
-       $munin_ips = split(regsubst($v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
+       $munin_ips = split(regsubst($::v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
 
        munin::check { $munin_ips: script => 'ip_', }
 
        if $v6ips {
-               $munin6_ips = split(regsubst($v6ips, '([^,]+)', 'ip_\1', 'G'), ',')
+               $munin6_ips = split(regsubst($::v6ips, '([^,]+)', 'ip_\1', 'G'), ',')
                munin::ipv6check { $munin6_ips: }
        }
 
        # get rid of old stuff
-       $munin6_ip6s = split(regsubst($v6ips, '([^,]+)', 'ip6_\1', 'G'), ',')
+       $munin6_ip6s = split(regsubst($::v6ips, '([^,]+)', 'ip6_\1', 'G'), ',')
        munin::check { $munin6_ip6s: ensure => absent }
 
        file { '/etc/ferm':

diff --git a/modules/ferm/templates/interfaces.conf.erb b/modules/ferm/templates/interfaces.conf.erb
index fbe960266d9437ecd742599883c738d788e28f69..496054c42de201af4857a70e1bf031adb56711e4 100644 (file)
--- 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('::v4ips').split(',').join(' ')
 rescue
        ''
 end
 %>);
 def $MUNIN6_IPS = (<%=
 begin
-       v6ips == '' ? '' : v6ips.split(',').join(' ')
+       scope.lookupvar('::v6ips') == '' ? '' : scope.lookupvar('::v6ips').split(',').join(' ')
 rescue
        ''
 end