From a20a178c422236e56da94ba4a841d78c37a7fbfe Mon Sep 17 00:00:00 2001
From: Chris Ricker <chricker@cisco.com>
Date: Tue, 27 May 2014 13:17:55 -0400
Subject: [PATCH] Fix swift quota filter names

Align account_quotas and container_quotas filter names to prevent
swift-proxy from tracing back when quotas are enabled.

Change-Id: I835b05fa5d9eb1fb00cc8309d78bafcd4969d0d3
Closes-Bug: #1323761
---
 spec/classes/swift_proxy_account_quotas_spec.rb   | 2 +-
 spec/classes/swift_proxy_container_quotas_spec.rb | 2 +-
 templates/proxy/account_quotas.conf.erb           | 2 +-
 templates/proxy/container_quotas.conf.erb         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/classes/swift_proxy_account_quotas_spec.rb b/spec/classes/swift_proxy_account_quotas_spec.rb
index 03a4794e..5b52ba43 100644
--- a/spec/classes/swift_proxy_account_quotas_spec.rb
+++ b/spec/classes/swift_proxy_account_quotas_spec.rb
@@ -37,7 +37,7 @@ describe 'swift::proxy::account_quotas' do
     "/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/80_swift_account_quotas"
   end
 
-  it { should contain_file(fragment_file).with_content(/\[filter:account-quotas\]/) }
+  it { should contain_file(fragment_file).with_content(/\[filter:account_quotas\]/) }
   it { should contain_file(fragment_file).with_content(/use = egg:swift#account_quotas/) }
 
 end
diff --git a/spec/classes/swift_proxy_container_quotas_spec.rb b/spec/classes/swift_proxy_container_quotas_spec.rb
index 476135df..737967d4 100644
--- a/spec/classes/swift_proxy_container_quotas_spec.rb
+++ b/spec/classes/swift_proxy_container_quotas_spec.rb
@@ -37,7 +37,7 @@ describe 'swift::proxy::container_quotas' do
     "/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/81_swift_container_quotas"
   end
 
-  it { should contain_file(fragment_file).with_content(/\[filter:container-quotas\]/) }
+  it { should contain_file(fragment_file).with_content(/\[filter:container_quotas\]/) }
   it { should contain_file(fragment_file).with_content(/use = egg:swift#container_quotas/) }
 
 end
diff --git a/templates/proxy/account_quotas.conf.erb b/templates/proxy/account_quotas.conf.erb
index 3a99cdfa..14f32ae8 100644
--- a/templates/proxy/account_quotas.conf.erb
+++ b/templates/proxy/account_quotas.conf.erb
@@ -1,4 +1,4 @@
 
-[filter:account-quotas]
+[filter:account_quotas]
 use = egg:swift#account_quotas
 
diff --git a/templates/proxy/container_quotas.conf.erb b/templates/proxy/container_quotas.conf.erb
index f2816c9f..1da47df5 100644
--- a/templates/proxy/container_quotas.conf.erb
+++ b/templates/proxy/container_quotas.conf.erb
@@ -1,4 +1,4 @@
 
-[filter:container-quotas]
+[filter:container_quotas]
 use = egg:swift#container_quotas