From b5290c4f9bd5c21da00856dcc691842bb2e8e3f6 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Fri, 11 Jan 2013 14:12:04 -0800
Subject: [PATCH] Remove leading set from config

one of the config settings previously
contained a leading set before a config
setting.

This does not convert to the ini file format AFAIK, so
it has been changed.
---
 spec/classes/swift_proxy_spec.rb | 5 ++++-
 templates/proxy-server.conf.erb  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/spec/classes/swift_proxy_spec.rb b/spec/classes/swift_proxy_spec.rb
index 0db02ec8..77e705d8 100644
--- a/spec/classes/swift_proxy_spec.rb
+++ b/spec/classes/swift_proxy_spec.rb
@@ -64,6 +64,7 @@ describe 'swift::proxy' do
             'bind_port = 8080',
             "workers = #{facts[:processorcount]}",
             'user = swift',
+            'log_level = INFO',
             '[pipeline:main]',
             'pipeline = healthcheck cache tempauth proxy-server',
             '[app:proxy-server]',
@@ -89,7 +90,8 @@ describe 'swift::proxy' do
            :workers => 3,
            :pipeline  => ['swauth', 'proxy-server'],
            :allow_account_management => false,
-           :account_autocreate => false
+           :account_autocreate => false,
+           :log_level          => 'DEBUG'
           }
         end
         it 'should build the header file with provided values' do
@@ -99,6 +101,7 @@ describe 'swift::proxy' do
               'bind_port = 80',
               "workers = 3",
               'user = swift',
+              'log_level = DEBUG',
               '[pipeline:main]',
               'pipeline = swauth proxy-server',
               '[app:proxy-server]',
diff --git a/templates/proxy-server.conf.erb b/templates/proxy-server.conf.erb
index 67799f36..eed9f343 100644
--- a/templates/proxy-server.conf.erb
+++ b/templates/proxy-server.conf.erb
@@ -7,7 +7,7 @@ bind_ip = <%= proxy_local_net_ip %>
 <% end %>
 workers = <%= workers %>
 user = swift
-set log_level = <%= log_level %>
+log_level = <%= log_level %>
 
 [pipeline:main]
 pipeline = <%= pipeline.to_a.join(' ') %>