Merge "Update some deprecated Puppet variable references"

modules/iptables/templates/rules.erb

@@ -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 198.61.215.188 -j ACCEPT
 # 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
 <% end -%>
 # 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
 <% end -%>
 # Per-host rules
-<% rules4.each do |rule| -%>
+<% @rules4.each do |rule| -%>
 -A openstack-INPUT <%= rule %>
 <% end -%>
 -A openstack-INPUT -j REJECT --reject-with icmp-host-prohibited

modules/iptables/templates/rules.v6.erb

@@ -12,15 +12,15 @@
 # SNMP from openstack cacti
 -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.each do |port| -%>
+<% @public_tcp_ports.each do |port| -%>
 -A openstack-INPUT -m state --state NEW -m tcp -p tcp --dport <%= port %> -j ACCEPT
 <% end -%>
 # 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
 <% end -%>
 # Per-host rules
-<% rules6.each do |rule| -%>
+<% @rules6.each do |rule| -%>
 -A openstack-INPUT <%= rule %>
 <% end -%>
 -A openstack-INPUT -j REJECT --reject-with icmp6-adm-prohibited

modules/openstack_project/templates/puppet.conf.erb

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

modules/packagekit/templates/packagekit-background.erb

@@ -1,17 +1,17 @@
 # should we attempt to do this? (valid: yes|no)
-ENABLED=<%= enabled %>
+ENABLED=<%= @enabled %>
 
 # 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
 # by default MAILTO is unset, so crond mails the output by itself
-<% if mailto then %>
-MAILTO=<%= mailto %>
+<% if @mailto then %>
+MAILTO=<%= @mailto %>
 <% end %>
 
 # you may set SYSTEMNAME if you want your PackageKit emails tagged differently
 # default is output of hostname command
-<% if system_name then %>
-SYSTEM_NAME=<%= system_name %>
+<% if @system_name then %>
+SYSTEM_NAME=<%= @system_name %>
 <% end %>