openstack/puppet-swift
Code Issues Proposed changes

Support for allow_versions in swift containers

Browse Source 
The previous patch (37493) was just implementing the feature partially

Change-Id: I0adc55a22161fa3768d941e5ae996cc47048efa5
This commit is contained in:
Francesco Vollero 2014-02-25 17:21:10 +01:00
parent edd25ce6b3
commit d0caf58916
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/storage/all.pp
View File

@ -9,6 +9,8 @@
# Optional. Defaults to /srv/node/ # Optional. Defaults to /srv/node/
# [*object_port*] Port where object storage server should be hosted. # [*object_port*] Port where object storage server should be hosted.
# Optional. Defaults to 6000. # Optional. Defaults to 6000.
# [*allow_versions*] Boolean to enable the versioning in swift container
# Optional. Default to false.
# [*container_port*] Port where the container storage server should be hosted. # [*container_port*] Port where the container storage server should be hosted.
# Optional. Defaults to 6001. # Optional. Defaults to 6001.
# [*account_port*] Port where the account storage server should be hosted. # [*account_port*] Port where the account storage server should be hosted.
@ -23,6 +25,7 @@ class swift::storage::all(
$account_port = '6002', $account_port = '6002',
$object_pipeline = undef, $object_pipeline = undef,
$container_pipeline = undef, $container_pipeline = undef,
$allow_versions = false,
$mount_check = false, $mount_check = false,
$account_pipeline = undef, $account_pipeline = undef,
$log_facility = 'LOG_LOCAL2' $log_facility = 'LOG_LOCAL2'
@ -50,6 +53,7 @@ class swift::storage::all(
config_file_path => 'container-server.conf', config_file_path => 'container-server.conf',
pipeline => $container_pipeline, pipeline => $container_pipeline,
log_facility => $log_facility, log_facility => $log_facility,
allow_versions => $allow_versions,
} }
swift::storage::server { $object_port: swift::storage::server { $object_port:

4
spec/classes/swift_storage_all_spec.rb
View File

@ -44,6 +44,7 @@ describe 'swift::storage::all' do
:object_pipeline => ["1", "2"], :object_pipeline => ["1", "2"],
:container_pipeline => ["3", "4"], :container_pipeline => ["3", "4"],
:account_pipeline => ["5", "6"], :account_pipeline => ["5", "6"],
:allow_versions => true,
:log_facility => ['LOG_LOCAL2', 'LOG_LOCAL3'], :log_facility => ['LOG_LOCAL2', 'LOG_LOCAL3'],
} }
].each do |param_set| ].each do |param_set|
@ -99,7 +100,8 @@ describe 'swift::storage::all' do
it { should contain_swift__storage__server(param_hash[:container_port]).with( it { should contain_swift__storage__server(param_hash[:container_port]).with(
{:type => 'container', {:type => 'container',
:config_file_path => 'container-server.conf', :config_file_path => 'container-server.conf',
:pipeline => param_hash[:container_pipeline] || 'container-server' }.merge(storage_server_defaults) :pipeline => param_hash[:container_pipeline] || 'container-server',
:allow_versions => param_hash[:allow_versions] || false }.merge(storage_server_defaults)
)} )}
it { should contain_class('rsync::server').with( it { should contain_class('rsync::server').with(