summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElizabeth Krumbach Joseph <lyz@princessleia.com>2014-01-29 14:50:05 -0800
committerElizabeth Krumbach Joseph <lyz@princessleia.com>2014-01-29 14:50:05 -0800
commit593465a104d4e0e383117ba745fdd579c7a354e0 (patch)
treeed123ab28cf0c21dac2b9896048557d86ce6cd1d
parente164471e36cc6ae240748cd683e7b484a93ea136 (diff)
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
-rw-r--r--templates/rules.erb6
-rw-r--r--templates/rules.v6.erb6
2 files changed, 6 insertions, 6 deletions
diff --git a/templates/rules.erb b/templates/rules.erb
index 81e4f10..23283ce 100644
--- a/templates/rules.erb
+++ b/templates/rules.erb
@@ -14,15 +14,15 @@
14-A openstack-INPUT -m udp -p udp --dport 161 -s 50.57.120.246 -j ACCEPT 14-A openstack-INPUT -m udp -p udp --dport 161 -s 50.57.120.246 -j ACCEPT
15-A openstack-INPUT -m udp -p udp --dport 161 -s 198.61.215.188 -j ACCEPT 15-A openstack-INPUT -m udp -p udp --dport 161 -s 198.61.215.188 -j ACCEPT
16# Public TCP ports 16# Public TCP ports
17<% public_tcp_ports.each do |port| -%> 17<% @public_tcp_ports.each do |port| -%>
18-A openstack-INPUT -m state --state NEW -m tcp -p tcp --dport <%= port %> -j ACCEPT 18-A openstack-INPUT -m state --state NEW -m tcp -p tcp --dport <%= port %> -j ACCEPT
19<% end -%> 19<% end -%>
20# Public UDP ports 20# Public UDP ports
21<% public_udp_ports.each do |port| -%> 21<% @public_udp_ports.each do |port| -%>
22-A openstack-INPUT -m udp -p udp --dport <%= port %> -j ACCEPT 22-A openstack-INPUT -m udp -p udp --dport <%= port %> -j ACCEPT
23<% end -%> 23<% end -%>
24# Per-host rules 24# Per-host rules
25<% rules4.each do |rule| -%> 25<% @rules4.each do |rule| -%>
26-A openstack-INPUT <%= rule %> 26-A openstack-INPUT <%= rule %>
27<% end -%> 27<% end -%>
28-A openstack-INPUT -j REJECT --reject-with icmp-host-prohibited 28-A openstack-INPUT -j REJECT --reject-with icmp-host-prohibited
diff --git a/templates/rules.v6.erb b/templates/rules.v6.erb
index 23097b6..8bbc6fe 100644
--- a/templates/rules.v6.erb
+++ b/templates/rules.v6.erb
@@ -12,15 +12,15 @@
12# SNMP from openstack cacti 12# SNMP from openstack cacti
13-A openstack-INPUT -m udp -p udp --dport 161 -s 2001:4800:780d:0509:3bc3:d7f6:ff04:49de -j ACCEPT 13-A openstack-INPUT -m udp -p udp --dport 161 -s 2001:4800:780d:0509:3bc3:d7f6:ff04:49de -j ACCEPT
14# Public TCP ports 14# Public TCP ports
15<% public_tcp_ports.each do |port| -%> 15<% @public_tcp_ports.each do |port| -%>
16-A openstack-INPUT -m state --state NEW -m tcp -p tcp --dport <%= port %> -j ACCEPT 16-A openstack-INPUT -m state --state NEW -m tcp -p tcp --dport <%= port %> -j ACCEPT
17<% end -%> 17<% end -%>
18# Public UDP ports 18# Public UDP ports
19<% public_udp_ports.each do |port| -%> 19<% @public_udp_ports.each do |port| -%>
20-A openstack-INPUT -m udp -p udp --dport <%= port %> -j ACCEPT 20-A openstack-INPUT -m udp -p udp --dport <%= port %> -j ACCEPT
21<% end -%> 21<% end -%>
22# Per-host rules 22# Per-host rules
23<% rules6.each do |rule| -%> 23<% @rules6.each do |rule| -%>
24-A openstack-INPUT <%= rule %> 24-A openstack-INPUT <%= rule %>
25<% end -%> 25<% end -%>
26-A openstack-INPUT -j REJECT --reject-with icmp6-adm-prohibited 26-A openstack-INPUT -j REJECT --reject-with icmp6-adm-prohibited