openstack
/
puppet-swift
Code Issues Proposed changes

Merge "Skip creating files/directories created by packages"

This commit is contained in:
Zuul 2022-05-23 17:39:59 +00:00 committed by Gerrit Code Review
parent 1a1264b435 0461df0c09
commit a6a2451e46
2 changed files with 10 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/init.pp
View File

@ -65,32 +65,10 @@ class swift(
tag => ['openstack', 'swift-package'],
}
File {
owner => $::swift::params::user,
group => $::swift::params::group,
tag => 'swift-file',
}
file { '/etc/swift':
ensure => directory,
}
user {'swift':
ensure => present,
require => Anchor['swift::install::end'],
}
file { '/var/lib/swift':
ensure => directory,
}
file { '/var/run/swift':
ensure => directory,
selinux_ignore_defaults => true,
}
file { '/etc/swift/swift.conf':
ensure => file,
}
File['/etc/swift/swift.conf'] -> Swift_config<||>
swift_config {
'swift-hash/swift_hash_path_suffix': value => $swift_hash_path_suffix;

33
spec/classes/swift_spec.rb
View File

@ -29,34 +29,19 @@ describe 'swift' do
end
it {is_expected.to contain_user('swift')}
it {is_expected.to contain_file('/etc/swift').with(
{:ensure => 'directory'}.merge(file_defaults)
)}
it {is_expected.to contain_file('/var/run/swift').with(
{:ensure => 'directory',
:selinux_ignore_defaults => true}.merge(file_defaults)
)}
it {is_expected.to contain_file('/var/lib/swift').with(
{:ensure => 'directory'}.merge(file_defaults)
)}
it {is_expected.to contain_file('/etc/swift/swift.conf').with(
{:ensure => 'file'}.merge(file_defaults)
)}
it 'configures swift.conf' do
is_expected.to contain_swift_config(
'swift-hash/swift_hash_path_suffix').with_value('string')
end
it 'configures swift.conf' do
is_expected.to contain_swift_config(
'swift-constraints/max_header_size').with_value('16384')
end
it { is_expected.to contain_package('swift').with_ensure('present')
is_expected.to contain_package('swift').that_requires('Anchor[swift::install::begin]')
is_expected.to contain_package('swift').that_notifies('Anchor[swift::install::end]')}
it { is_expected.to contain_file('/etc/swift/swift.conf').with_before(/Swift_config\[.+\]/) }
it {
is_expected.to contain_package('swift').with_ensure('present')
is_expected.to contain_package('swift').that_requires('Anchor[swift::install::begin]')
is_expected.to contain_package('swift').that_notifies('Anchor[swift::install::end]')
}
end
describe 'when overriding package_ensure parameter' do
@ -68,11 +53,13 @@ describe 'swift' do
describe 'when providing swift_hash_path_prefix and swift_hash_path_suffix' do
let (:params) do
{ :swift_hash_path_suffix => 'mysuffix',
:swift_hash_path_prefix => 'myprefix' }
{
:swift_hash_path_suffix => 'mysuffix',
:swift_hash_path_prefix => 'myprefix'
}
end
it 'should configure swift.conf' do
it 'should configure swift.conf' do
is_expected.to contain_swift_config(
'swift-hash/swift_hash_path_suffix').with_value('mysuffix')
is_expected.to contain_swift_config(