openstack/puppet-swift
Code Issues Proposed changes

Bugfix: Fix fragment name for Quota middleware

Browse Source 
Bugfix for commit 4157cb9 (uniformisation of pipeline names)
  According other swift proxy middlewares, the concat fragments
    doesn't contains « proxy » (concat frag. are generated by pipeline)
    see l195 and l196 of tests/site.pp

Change-Id: I99f9e5f5282b3e8db89fd56109ec8074ea1fa8f5
This commit is contained in:
Sebastien Badia 2013-11-27 16:20:37 +01:00
parent 000d63b654
commit c1aee547bc
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/proxy/account_quotas.pp
View File

@ -19,7 +19,7 @@
#
class swift::proxy::account_quotas() {
concat::fragment { 'swift_proxy_account_quotas':
concat::fragment { 'swift_account_quotas':
target => '/etc/swift/proxy-server.conf',
content => template('swift/proxy/account_quotas.conf.erb'),
order => '80',

2
manifests/proxy/container_quotas.pp
View File

@ -19,7 +19,7 @@
#
class swift::proxy::container_quotas() {
concat::fragment { 'swift_proxy_container_quotas':
concat::fragment { 'swift_container_quotas':
target => '/etc/swift/proxy-server.conf',
content => template('swift/proxy/container_quotas.conf.erb'),
order => '81',

2
spec/classes/swift_proxy_account_quotas_spec.rb
View File

@ -34,7 +34,7 @@ describe 'swift::proxy::account_quotas' do
end
let :fragment_file do
"/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/80_swift_proxy_account_quotas"
"/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\]/) }

2
spec/classes/swift_proxy_container_quotas_spec.rb
View File

@ -34,7 +34,7 @@ describe 'swift::proxy::container_quotas' do
end
let :fragment_file do
"/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/81_swift_proxy_container_quotas"
"/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\]/) }