Browse Source

Update some deprecated Puppet variable references

While getting these scripts to run on Puppet 3 with Fedora 20, I got
a series of warnings about the deprecation of variable names. These
changes should also continue to work fine on Puppet 2.7.

Change-Id: I232f5f5a9abbe94be9fe2d3b8c82f009c03a11f3
changes/39/151039/1
Elizabeth Krumbach Joseph 5 years ago
parent
commit
593465a104
2 changed files with 6 additions and 6 deletions
  1. 3
    3
      templates/rules.erb
  2. 3
    3
      templates/rules.v6.erb

+ 3
- 3
templates/rules.erb View File

@@ -14,15 +14,15 @@
14 14
 -A openstack-INPUT -m udp -p udp --dport 161 -s 50.57.120.246 -j ACCEPT
15 15
 -A openstack-INPUT -m udp -p udp --dport 161 -s 198.61.215.188 -j ACCEPT
16 16
 # Public TCP ports
17
-<% public_tcp_ports.each do |port| -%>
17
+<% @public_tcp_ports.each do |port| -%>
18 18
 -A openstack-INPUT -m state --state NEW -m tcp -p tcp --dport <%= port %> -j ACCEPT
19 19
 <% end -%>
20 20
 # Public UDP ports
21
-<% public_udp_ports.each do |port| -%>
21
+<% @public_udp_ports.each do |port| -%>
22 22
 -A openstack-INPUT -m udp -p udp --dport <%= port %> -j ACCEPT
23 23
 <% end -%>
24 24
 # Per-host rules
25
-<% rules4.each do |rule| -%>
25
+<% @rules4.each do |rule| -%>
26 26
 -A openstack-INPUT <%= rule %>
27 27
 <% end -%>
28 28
 -A openstack-INPUT -j REJECT --reject-with icmp-host-prohibited

+ 3
- 3
templates/rules.v6.erb View File

@@ -12,15 +12,15 @@
12 12
 # SNMP from openstack cacti
13 13
 -A openstack-INPUT -m udp -p udp --dport 161 -s 2001:4800:780d:0509:3bc3:d7f6:ff04:49de -j ACCEPT
14 14
 # Public TCP ports
15
-<% public_tcp_ports.each do |port| -%>
15
+<% @public_tcp_ports.each do |port| -%>
16 16
 -A openstack-INPUT -m state --state NEW -m tcp -p tcp --dport <%= port %> -j ACCEPT
17 17
 <% end -%>
18 18
 # Public UDP ports
19
-<% public_udp_ports.each do |port| -%>
19
+<% @public_udp_ports.each do |port| -%>
20 20
 -A openstack-INPUT -m udp -p udp --dport <%= port %> -j ACCEPT
21 21
 <% end -%>
22 22
 # Per-host rules
23
-<% rules6.each do |rule| -%>
23
+<% @rules6.each do |rule| -%>
24 24
 -A openstack-INPUT <%= rule %>
25 25
 <% end -%>
26 26
 -A openstack-INPUT -j REJECT --reject-with icmp6-adm-prohibited

Loading…
Cancel
Save