From 708e41e9c694f074b7022ba42e72194eb2a3c32e Mon Sep 17 00:00:00 2001 From: Elizabeth Krumbach Joseph Date: Wed, 29 Jan 2014 14:50:05 -0800 Subject: [PATCH] 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 --- modules/iptables/templates/rules.erb | 6 +++--- modules/iptables/templates/rules.v6.erb | 6 +++--- modules/openstack_project/templates/puppet.conf.erb | 2 +- .../packagekit/templates/packagekit-background.erb | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/iptables/templates/rules.erb b/modules/iptables/templates/rules.erb index 81e4f10bcc..23283ced5a 100644 --- a/modules/iptables/templates/rules.erb +++ b/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 diff --git a/modules/iptables/templates/rules.v6.erb b/modules/iptables/templates/rules.v6.erb index 23097b6a37..8bbc6fe287 100644 --- a/modules/iptables/templates/rules.v6.erb +++ b/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 diff --git a/modules/openstack_project/templates/puppet.conf.erb b/modules/openstack_project/templates/puppet.conf.erb index f99bdd8fa4..70dc202100 100644 --- a/modules/openstack_project/templates/puppet.conf.erb +++ b/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] diff --git a/modules/packagekit/templates/packagekit-background.erb b/modules/packagekit/templates/packagekit-background.erb index cc2ee25076..2d772b3128 100644 --- a/modules/packagekit/templates/packagekit-background.erb +++ b/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 %>