opendev/system-config
Code Issues Proposed changes

Update some deprecated Puppet variable references

Browse Source 
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
This commit is contained in:
Elizabeth Krumbach Joseph 2014-01-29 14:50:05 -08:00
parent 618ccebc7f
commit 708e41e9c6
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/iptables/templates/rules.erb
View File

@ -14,15 +14,15 @@
-A openstack-INPUT -m udp -p udp --dport 161 -s 50.57.120.246 -j ACCEPT -A openstack-INPUT -m udp -p udp --dport 161 -s 50.57.120.246 -j ACCEPT
-A openstack-INPUT -m udp -p udp --dport 161 -s 198.61.215.188 -j ACCEPT -A openstack-INPUT -m udp -p udp --dport 161 -s 198.61.215.188 -j ACCEPT
# Public TCP ports # Public TCP ports
<% public_tcp_ports.each do |port| -%> <% @public_tcp_ports.each do |port| -%>
-A openstack-INPUT -m state --state NEW -m tcp -p tcp --dport <%= port %> -j ACCEPT -A openstack-INPUT -m state --state NEW -m tcp -p tcp --dport <%= port %> -j ACCEPT
<% end -%> <% end -%>
# Public UDP ports # Public UDP ports
<% public_udp_ports.each do |port| -%> <% @public_udp_ports.each do |port| -%>
-A openstack-INPUT -m udp -p udp --dport <%= port %> -j ACCEPT -A openstack-INPUT -m udp -p udp --dport <%= port %> -j ACCEPT
<% end -%> <% end -%>
# Per-host rules # Per-host rules
<% rules4.each do |rule| -%> <% @rules4.each do |rule| -%>
-A openstack-INPUT <%= rule %> -A openstack-INPUT <%= rule %>
<% end -%> <% end -%>
-A openstack-INPUT -j REJECT --reject-with icmp-host-prohibited -A openstack-INPUT -j REJECT --reject-with icmp-host-prohibited

6
modules/iptables/templates/rules.v6.erb
View File

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

2
modules/openstack_project/templates/puppet.conf.erb
View File

@ -6,7 +6,7 @@ rundir=/var/run/puppet
factpath=$vardir/lib/facter factpath=$vardir/lib/facter
templatedir=$confdir/templates templatedir=$confdir/templates
server=ci-puppetmaster.openstack.org server=ci-puppetmaster.openstack.org
certname=<%= certname %> certname=<%= @certname %>
pluginsync=true pluginsync=true
[master] [master]

12
modules/packagekit/templates/packagekit-background.erb
View File

@ -1,17 +1,17 @@
# should we attempt to do this? (valid: yes|no) # should we attempt to do this? (valid: yes|no)
ENABLED=<%= enabled %> ENABLED=<%= @enabled %>
# don't install, just check (valid: yes|no) # don't install, just check (valid: yes|no)
CHECK_ONLY=<%= check_only %> CHECK_ONLY=<%= @check_only %>
# if MAILTO is set, the mail command is used to deliver PackageKit output # if MAILTO is set, the mail command is used to deliver PackageKit output
# by default MAILTO is unset, so crond mails the output by itself # by default MAILTO is unset, so crond mails the output by itself
<% if mailto then %> <% if @mailto then %>
MAILTO=<%= mailto %> MAILTO=<%= @mailto %>
<% end %> <% end %>
# you may set SYSTEMNAME if you want your PackageKit emails tagged differently # you may set SYSTEMNAME if you want your PackageKit emails tagged differently
# default is output of hostname command # default is output of hostname command
<% if system_name then %> <% if @system_name then %>
SYSTEM_NAME=<%= system_name %> SYSTEM_NAME=<%= @system_name %>
<% end %> <% end %>