Fix swift quota filter names

rickerc · rickerc · commit 0ba3fab779e3 · 2014-05-27T17:20:42.000Z
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
diff --git a/spec/classes/swift_proxy_account_quotas_spec.rb b/spec/classes/swift_proxy_account_quotas_spec.rb
@@ -37,7 +37,7 @@
     "/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
@@ -37,7 +37,7 @@
     "/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
@@ -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
@@ -1,4 +1,4 @@
 
-[filter:container-quotas]
+[filter:container_quotas]
 use = egg:swift#container_quotas
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`
`2`		`-[filter:account-quotas]`
	`2`	`+[filter:account_quotas]`
`3`	`3`	`use = egg:swift#account_quotas`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`
`2`		`-[filter:container-quotas]`
	`2`	`+[filter:container_quotas]`
`3`	`3`	`use = egg:swift#container_quotas`
`4`	`4`