diff --git a/templates/account-server.conf.erb b/templates/account-server.conf.erb index a737a8d9..ceec4d55 100644 --- a/templates/account-server.conf.erb +++ b/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 %> diff --git a/templates/container-server.conf.erb b/templates/container-server.conf.erb index d3a6d58c..63d70b04 100644 --- a/templates/container-server.conf.erb +++ b/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] diff --git a/templates/dispersion.conf.erb b/templates/dispersion.conf.erb index ac88fee3..6300b030 100644 --- a/templates/dispersion.conf.erb +++ b/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 %> diff --git a/templates/object-server.conf.erb b/templates/object-server.conf.erb index 922b551b..3fc3088b 100644 --- a/templates/object-server.conf.erb +++ b/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] diff --git a/templates/proxy-server.conf.erb b/templates/proxy-server.conf.erb index eed9f343..b9e517e8 100644 --- a/templates/proxy-server.conf.erb +++ b/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 %> diff --git a/templates/proxy/authtoken.conf.erb b/templates/proxy/authtoken.conf.erb index 1ffb616a..de9ab81c 100644 --- a/templates/proxy/authtoken.conf.erb +++ b/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 %> diff --git a/templates/proxy/cache.conf.erb b/templates/proxy/cache.conf.erb index 6348fd02..88cbeb51 100644 --- a/templates/proxy/cache.conf.erb +++ b/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(',') %> diff --git a/templates/proxy/keystone.conf.erb b/templates/proxy/keystone.conf.erb index 490e4e0f..741af3aa 100644 --- a/templates/proxy/keystone.conf.erb +++ b/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 %> diff --git a/templates/proxy/ratelimit.conf.erb b/templates/proxy/ratelimit.conf.erb index 3532afa9..b4b6563c 100644 --- a/templates/proxy/ratelimit.conf.erb +++ b/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 %> diff --git a/templates/proxy/s3token.conf.erb b/templates/proxy/s3token.conf.erb index aa445c21..82e1f465 100644 --- a/templates/proxy/s3token.conf.erb +++ b/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 %> diff --git a/templates/proxy/swauth.conf.erb b/templates/proxy/swauth.conf.erb index e709a72f..f83a1916 100644 --- a/templates/proxy/swauth.conf.erb +++ b/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 %> diff --git a/templates/recon.conf.erb b/templates/recon.conf.erb index bb64ffcd..82bf06dc 100644 --- a/templates/recon.conf.erb +++ b/templates/recon.conf.erb @@ -1,3 +1,3 @@ [filter:recon] use = egg:swift#recon -recon_cache_path = <%= cache_path %> +recon_cache_path = <%= @cache_path %> diff --git a/templates/swift.conf.erb b/templates/swift.conf.erb index 3bee313d..8b6744ca 100644 --- a/templates/swift.conf.erb +++ b/templates/swift.conf.erb @@ -1,2 +1,2 @@ [swift-hash] -swift_hash_path_suffix = <%= swift_hash_suffix %> +swift_hash_path_suffix = <%= @swift_hash_suffix %> diff --git a/templates/swift_keystone_test.erb b/templates/swift_keystone_test.erb index f8a7398f..61cf6489 100644 --- a/templates/swift_keystone_test.erb +++ b/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}'"