openstack/puppet-swift
Code Issues Proposed changes

Revert "Use swift_config"

Browse Source 
This reverts commit e7bb58e6ba.

Fixes LP Bug #1216881.

Change-Id: I65109b8bfeeb2f59971dadbdb14ec47b1fc82a89
This commit is contained in:
Dan Prince
2013-08-26 08:11:41 -04:00
parent d9d0917112
commit f10bcda7e6
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@@ -66,9 +66,7 @@ class swift(
file { '/etc/swift/swift.conf': file { '/etc/swift/swift.conf':
ensure => present, ensure => present,
mode => '0660', mode => '0660',
content => template('swift/swift.conf.erb'),
} }
swift_config { 'swift-hash/swift_hash_path_suffix':
value => $swift_hash_suffix
}
} }

5
spec/classes/swift_spec.rb
View File

@@ -45,12 +45,9 @@ describe 'swift' do
it {should contain_file('/etc/swift/swift.conf').with( it {should contain_file('/etc/swift/swift.conf').with(
{:ensure => 'present', {:ensure => 'present',
:mode => '0660', :mode => '0660',
:content => "[swift-hash]\nswift_hash_path_suffix = string\n"
}.merge(file_defaults) }.merge(file_defaults)
)} )}
it 'configures swift.conf' do
should contain_swift_config(
'swift-hash/swift_hash_path_suffix').with_value('string')
end
it {should contain_package('swift').with_ensure('present')} it {should contain_package('swift').with_ensure('present')}
it {should contain_user('swift')} it {should contain_user('swift')}
it {should contain_file('/var/lib/swift').with_ensure('directory')} it {should contain_file('/var/lib/swift').with_ensure('directory')}

2
templates/swift.conf.erb Normal file
View File

@@ -0,0 +1,2 @@
[swift-hash]
swift_hash_path_suffix = <%= @swift_hash_suffix %>