From 8dd197a730d740d6407c0aa9572471868d4285c7 Mon Sep 17 00:00:00 2001
From: Xingchao Yu <xingchao@unitedstack.com>
Date: Fri, 25 Oct 2013 11:43:35 +0800
Subject: [PATCH] Fix puppet 3.x template variable deprecation warning

Change-Id: I0982c90b79ba4ff0844d5da778ae97b2f5221c37
loses-bug: #1244510
---
 templates/account-server.conf.erb   |  6 +++---
 templates/container-server.conf.erb | 10 +++++-----
 templates/object-server.conf.erb    |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/templates/account-server.conf.erb b/templates/account-server.conf.erb
index a70ad1a7..d6adaa05 100644
--- a/templates/account-server.conf.erb
+++ b/templates/account-server.conf.erb
@@ -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]
diff --git a/templates/container-server.conf.erb b/templates/container-server.conf.erb
index 085f721f..23f2998c 100644
--- a/templates/container-server.conf.erb
+++ b/templates/container-server.conf.erb
@@ -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 %>
diff --git a/templates/object-server.conf.erb b/templates/object-server.conf.erb
index 79c8c0ca..2a47c990 100644
--- a/templates/object-server.conf.erb
+++ b/templates/object-server.conf.erb
@@ -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 %>