puppet 3.0 fixes

firewall/templates/ip6tables.erb

@@ -14,7 +14,7 @@
 <% end -%>
 -A INPUT -p ipv6-icmp -j ACCEPT
 <%
-  firewall_rules.each do |rule|
+  @firewall_rules.each do |rule|
     rule = /(tcp|udp)\/([\d:]+)( .+)?/.match(rule)
     if not rule[3] or IPAddr.new(rule[3].strip()).ipv6?
 -%>
@@ -22,7 +22,7 @@
 <%
     end
   end
-  firewall_custom.each do |rule|
+  @firewall_custom.each do |rule|
 -%>
 <%= rule %>
 <% end -%>

firewall/templates/iptables.erb

@@ -8,7 +8,7 @@
 -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
 -A INPUT -p icmp --icmp-type any -j ACCEPT
 <%
-  firewall_rules.each do |rule|
+  @firewall_rules.each do |rule|
     rule = /(tcp|udp)\/([\d:]+)( .+)?/.match(rule)
     if not rule[3] or IPAddr.new(rule[3].strip()).ipv4?
 -%>
@@ -16,7 +16,7 @@
 <%
     end
   end
-  firewall_custom.each do |rule|
+  @firewall_custom.each do |rule|
 -%>
 <%= rule %>
 <% end -%>

firewall/templates/pf.conf.erb

@@ -8,10 +8,10 @@ pass out all
 pass in quick inet proto icmp all
 pass in quick inet6 proto icmp6 all
 
-<% firewall_rules.each do |rule| -%>
+<% @firewall_rules.each do |rule| -%>
 <%   rule = /(tcp|udp)\/([\d:]+)( .+)?/.match(rule) -%>
 pass in quick proto <%= rule[1] %><% if rule[3] %> from<%= rule[3] %><% end %> to port <%= rule[2] %>
 <% end -%>
-<% firewall_custom.each do |rule| -%>
+<% @firewall_custom.each do |rule| -%>
 <%= rule %>
 <% end -%>