Merge "Fix puppet 3.x template variable deprecation warning"

This commit is contained in:
Jenkins 2013-11-06 07:26:34 +00:00 committed by Gerrit Code Review
commit 040770582f
3 changed files with 11 additions and 11 deletions

@ -13,10 +13,10 @@ pipeline = <%= @pipeline.to_a.join(' ') %>
[app:account-server]
use = egg:swift#account
set log_name = account-server
set log_facility = <%= log_facility %>
set log_level = <%= log_level %>
set log_facility = <%= @log_facility %>
set log_level = <%= @log_level %>
set log_requests = True
set log_address = <%= log_address %>
set log_address = <%= @log_address %>
[account-replicator]

@ -12,13 +12,13 @@ allowed_sync_hosts = <%= scope.lookupvar("swift::storage::container::allowed_syn
pipeline = <%= @pipeline.to_a.join(' ') %>
[app:container-server]
allow_versions = <%= allow_versions %>
allow_versions = <%= @allow_versions %>
use = egg:swift#container
set log_name = container-server
set log_facility = <%= log_facility %>
set log_level = <%= log_level %>
set log_name = @container-server
set log_facility = <%= @log_facility %>
set log_level = <%= @log_level %>
set log_requests = True
set log_address = <%= log_address %>
set log_address = <%= @log_address %>
[container-replicator]
concurrency = <%= @replicator_concurrency %>

@ -13,10 +13,10 @@ pipeline = <%= @pipeline.to_a.join(' ') %>
[app:object-server]
use = egg:swift#object
set log_name = object-server
set log_facility = <%= log_facility %>
set log_level = <%= log_level %>
set log_facility = <%= @log_facility %>
set log_level = <%= @log_level %>
set log_requests = True
set log_address = <%= log_address %>
set log_address = <%= @log_address %>
[object-replicator]
concurrency = <%= @replicator_concurrency %>