Fix Puppet 3.2.x deprecation warnings

Change-Id: I4f6075fb189474ee071fa9b80944a5fe5c062193

templates/account-server.conf.erb

@@ -1,22 +1,22 @@
 [DEFAULT]
-devices = <%= devices %>
-bind_ip = <%= storage_local_net_ip %>
-bind_port = <%= bind_port %>
-mount_check = <%= mount_check %>
-user = <%= user %>
-log_facility = <%= log_facility %>
-workers = <%= workers %>
+devices = <%= @devices %>
+bind_ip = <%= @storage_local_net_ip %>
+bind_port = <%= @bind_port %>
+mount_check = <%= @mount_check %>
+user = <%= @user %>
+log_facility = <%= @log_facility %>
+workers = <%= @workers %>
 
 [pipeline:main]
-pipeline = <%= pipeline.to_a.join(' ') %>
+pipeline = <%= @pipeline.to_a.join(' ') %>
 
 [app:account-server]
 use = egg:swift#account
 
 [account-replicator]
-concurrency = <%= replicator_concurrency %>
+concurrency = <%= @replicator_concurrency %>
 
 [account-auditor]
 
 [account-reaper]
-concurrency = <%= reaper_concurrency %>
+concurrency = <%= @reaper_concurrency %>

templates/container-server.conf.erb

@@ -1,24 +1,24 @@
 [DEFAULT]
-devices = <%= devices %>
-bind_ip = <%= storage_local_net_ip %>
-bind_port = <%= bind_port %>
-mount_check = <%= mount_check %>
-user = <%= user %>
-log_facility = <%= log_facility %>
-workers = <%= workers %>
+devices = <%= @devices %>
+bind_ip = <%= @storage_local_net_ip %>
+bind_port = <%= @bind_port %>
+mount_check = <%= @mount_check %>
+user = <%= @user %>
+log_facility = <%= @log_facility %>
+workers = <%= @workers %>
 allowed_sync_hosts = <%= scope.lookupvar("swift::storage::container::allowed_sync_hosts").to_a.join(',') %>
 
 [pipeline:main]
-pipeline = <%= pipeline.to_a.join(' ') %>
+pipeline = <%= @pipeline.to_a.join(' ') %>
 
 [app:container-server]
 use = egg:swift#container
 
 [container-replicator]
-concurrency = <%= replicator_concurrency %>
+concurrency = <%= @replicator_concurrency %>
 
 [container-updater]
-concurrency = <%= updater_concurrency %>
+concurrency = <%= @updater_concurrency %>
 
 [container-auditor]
 

templates/dispersion.conf.erb

@@ -1,11 +1,11 @@
 [dispersion]
-auth_url = <%= auth_url %>
-auth_version = <%= auth_version %>
-auth_user = <%= auth_tenant %>:<%= auth_user %>
-auth_key = <%= auth_pass %>
-swift_dir = <%= swift_dir %>
-dispersion_coverage = <%= coverage %>
-retries = <%= retries %>
-concurrency = <%= concurrency %>
-dump_json = <%= dump_json %>
+auth_url = <%= @auth_url %>
+auth_version = <%= @auth_version %>
+auth_user = <%= @auth_tenant %>:<%= @auth_user %>
+auth_key = <%= @auth_pass %>
+swift_dir = <%= @swift_dir %>
+dispersion_coverage = <%= @coverage %>
+retries = <%= @retries %>
+concurrency = <%= @concurrency %>
+dump_json = <%= @dump_json %>
 

templates/object-server.conf.erb

@@ -1,22 +1,22 @@
 [DEFAULT]
-devices = <%= devices %>
-bind_ip = <%= storage_local_net_ip %>
-bind_port = <%= bind_port %>
-mount_check = <%= mount_check %>
-user = <%= user %>
-log_facility = <%= log_facility %>
-workers = <%= workers %>
+devices = <%= @devices %>
+bind_ip = <%= @storage_local_net_ip %>
+bind_port = <%= @bind_port %>
+mount_check = <%= @mount_check %>
+user = <%= @user %>
+log_facility = <%= @log_facility %>
+workers = <%= @workers %>
 
 [pipeline:main]
-pipeline = <%= pipeline.to_a.join(' ') %>
+pipeline = <%= @pipeline.to_a.join(' ') %>
 
 [app:object-server]
 use = egg:swift#object
 
 [object-replicator]
-concurrency = <%= replicator_concurrency %>
+concurrency = <%= @replicator_concurrency %>
 
 [object-updater]
-concurrency = <%= updater_concurrency %>
+concurrency = <%= @updater_concurrency %>
 
 [object-auditor]

templates/proxy-server.conf.erb

@@ -1,19 +1,19 @@
 # This file is managed by puppet.  Do not edit
 #
 [DEFAULT]
-bind_port = <%= port %>
-<% if proxy_local_net_ip %>
-bind_ip = <%= proxy_local_net_ip %>
+bind_port = <%= @port %>
+<% if @proxy_local_net_ip %>
+bind_ip = <%= @proxy_local_net_ip %>
 <% end %>
-workers = <%= workers %>
+workers = <%= @workers %>
 user = swift
-log_level = <%= log_level %>
+log_level = <%= @log_level %>
 
 [pipeline:main]
-pipeline = <%= pipeline.to_a.join(' ') %>
+pipeline = <%= @pipeline.to_a.join(' ') %>
 
 [app:proxy-server]
 use = egg:swift#proxy
-allow_account_management = <%= allow_account_management %>
-account_autocreate = <%= account_autocreate %>
+allow_account_management = <%= @allow_account_management %>
+account_autocreate = <%= @account_autocreate %>
 

templates/proxy/authtoken.conf.erb

@@ -1,19 +1,19 @@
 [filter:authtoken]
 paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
-auth_host = <%= auth_host %>
-auth_port = <%= auth_port %>
-auth_protocol = <%= auth_protocol %>
-<% if auth_admin_prefix -%>
-auth_admin_prefix = <%= auth_admin_prefix %>
+auth_host = <%= @auth_host %>
+auth_port = <%= @auth_port %>
+auth_protocol = <%= @auth_protocol %>
+<% if @auth_admin_prefix -%>
+auth_admin_prefix = <%= @auth_admin_prefix %>
 <% end -%>
-auth_uri = <%= auth_uri_real %>
+auth_uri = <%= @auth_uri_real %>
 # if its defined
-<% if admin_token -%>
-admin_token = <%= admin_token %>
+<% if @admin_token -%>
+admin_token = <%= @admin_token %>
 <% else -%>
-admin_tenant_name = <%= admin_tenant_name %>
-admin_user = <%= admin_user %>
-admin_password = <%= admin_password %>
+admin_tenant_name = <%= @admin_tenant_name %>
+admin_user = <%= @admin_user %>
+admin_password = <%= @admin_password %>
 <% end -%>
-delay_auth_decision = <%= delay_auth_decision %>
+delay_auth_decision = <%= @delay_auth_decision %>
 

templates/proxy/cache.conf.erb

@@ -1,3 +1,3 @@
 [filter:cache]
 use = egg:swift#memcache
-memcache_servers = <%= [memcache_servers].flatten.join(',') %>
+memcache_servers = <%= [@memcache_servers].flatten.join(',') %>

templates/proxy/keystone.conf.erb

@@ -1,7 +1,7 @@
 
 [filter:keystone]
 use = egg:swift#keystoneauth
-operator_roles = <%= operator_roles.to_a.join(', ') %>
-is_admin = <%= is_admin %>
-cache = <%= cache %>
+operator_roles = <%= @operator_roles.to_a.join(', ') %>
+is_admin = <%= @is_admin %>
+cache = <%= @cache %>
 

templates/proxy/ratelimit.conf.erb

@@ -1,8 +1,8 @@
 [filter:ratelimit]
 use = egg:swift#ratelimit
-clock_accuracy = <%= clock_accuracy %>
-max_sleep_time_seconds = <%= max_sleep_time_seconds %>
-log_sleep_time_seconds = <%= log_sleep_time_seconds %>
-rate_buffer_seconds = <%= rate_buffer_seconds %>
-account_ratelimit = <%= account_ratelimit %>
+clock_accuracy = <%= @clock_accuracy %>
+max_sleep_time_seconds = <%= @max_sleep_time_seconds %>
+log_sleep_time_seconds = <%= @log_sleep_time_seconds %>
+rate_buffer_seconds = <%= @rate_buffer_seconds %>
+account_ratelimit = <%= @account_ratelimit %>
 

templates/proxy/s3token.conf.erb

@@ -1,5 +1,5 @@
 [filter:s3token]
 paste.filter_factory = keystone.middleware.s3_token:filter_factory
-auth_port = <%= auth_port %>
-auth_protocol = <%= auth_protocol %>
-auth_host = <%= auth_host %>
+auth_port = <%= @auth_port %>
+auth_protocol = <%= @auth_protocol %>
+auth_host = <%= @auth_host %>

templates/proxy/swauth.conf.erb

@@ -2,6 +2,6 @@
 [filter:swauth]
 use = egg:swauth#swauth
 # this line is not in the install docs?
-default_swift_cluster = local#<%= swauth_endpoint %>
-super_admin_key = <%= swauth_super_admin_key %>
+default_swift_cluster = local#<%= @swauth_endpoint %>
+super_admin_key = <%= @swauth_super_admin_key %>
 

templates/recon.conf.erb

@@ -1,3 +1,3 @@
 [filter:recon]
 use = egg:swift#recon
-recon_cache_path = <%= cache_path %>
+recon_cache_path = <%= @cache_path %>

templates/swift.conf.erb

@@ -1,2 +1,2 @@
 [swift-hash]
-swift_hash_path_suffix = <%= swift_hash_suffix %>
+swift_hash_path_suffix = <%= @swift_hash_suffix %>

templates/swift_keystone_test.erb

@@ -8,9 +8,9 @@ require 'open3'
 require 'fileutils'
 
 # connection variables
-proxy_local_net_ip="<%= auth_server %>"
-user='<%= tenant %>:<%= user %>'
-password='<%= password %>'
+proxy_local_net_ip="<%= @auth_server %>"
+user='<%= @tenant %>:<%= @user %>'
+password='<%= @password %>'
 
 ## headers for curl requests
 #user_header="-H 'X-Storage-User: #{user}'"