openstack/puppet-swift
Code Issues Proposed changes

Avoid deprecated config_file_path

Browse Source 
This parameter was deprecated[1] and has no effect.

[1] bb656e5ee8

Change-Id: I8f18e65ea9466a9033084bc5bd3e91c520bccb6e
This commit is contained in:
Takashi Kajinami 2024-04-20 17:46:05 +09:00
parent 3af1a20fe0
commit f5be5ea566
3 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/storage/all.pp
View File

@ -220,22 +220,19 @@ from 6002 to 6202 and will be changed in a later release")
} }
swift::storage::server { "${account_port}": swift::storage::server { "${account_port}":
type => 'account', type => 'account',
config_file_path => 'account-server.conf', pipeline => $account_pipeline,
pipeline => $account_pipeline, workers => $account_server_workers,
workers => $account_server_workers,
} }
swift::storage::server { "${container_port}": swift::storage::server { "${container_port}":
type => 'container', type => 'container',
config_file_path => 'container-server.conf', pipeline => $container_pipeline,
pipeline => $container_pipeline, workers => $container_server_workers,
workers => $container_server_workers,
} }
swift::storage::server { "${object_port}": swift::storage::server { "${object_port}":
type => 'object', type => 'object',
config_file_path => 'object-server.conf',
pipeline => $object_pipeline, pipeline => $object_pipeline,
workers => $object_server_workers, workers => $object_server_workers,
splice => $splice, splice => $splice,

9
manifests/storage/node.pp
View File

@ -63,8 +63,7 @@ define swift::storage::node(
} }
swift::storage::server { "60${name}0": swift::storage::server { "60${name}0":
type => 'object', type => 'object',
config_file_path => 'object-server.conf',
} }
$ring_host = normalize_ip_for_uri($storage_local_net_ip) $ring_host = normalize_ip_for_uri($storage_local_net_ip)
@ -81,8 +80,7 @@ define swift::storage::node(
} }
swift::storage::server { "60${name}1": swift::storage::server { "60${name}1":
type => 'container', type => 'container',
config_file_path => 'container-server.conf',
} }
ring_container_device { "${ring_host}:60${name}1/${name}": ring_container_device { "${ring_host}:60${name}1/${name}":
zone => $zone, zone => $zone,
@ -90,8 +88,7 @@ define swift::storage::node(
} }
swift::storage::server { "60${name}2": swift::storage::server { "60${name}2":
type => 'account', type => 'account',
config_file_path => 'account-server.conf',
} }
ring_account_device { "${ring_host}:60${name}2/${name}": ring_account_device { "${ring_host}:60${name}2/${name}":
zone => $zone, zone => $zone,

33
spec/classes/swift_storage_all_spec.rb
View File

@ -81,28 +81,25 @@ describe 'swift::storage::all' do
end end
it { is_expected.to contain_swift__storage__server(param_hash[:account_port]).with( it { is_expected.to contain_swift__storage__server(param_hash[:account_port]).with(
:type => 'account', :type => 'account',
:config_file_path => 'account-server.conf', :incoming_chmod => param_hash[:incoming_chmod],
:incoming_chmod => param_hash[:incoming_chmod], :outgoing_chmod => param_hash[:outgoing_chmod],
:outgoing_chmod => param_hash[:outgoing_chmod], :pipeline => param_hash[:account_pipeline] || ['account-server']
:pipeline => param_hash[:account_pipeline] || ['account-server']
)} )}
it { is_expected.to contain_swift__storage__server(param_hash[:object_port]).with( it { is_expected.to contain_swift__storage__server(param_hash[:object_port]).with(
:type => 'object', :type => 'object',
:config_file_path => 'object-server.conf', :incoming_chmod => param_hash[:incoming_chmod],
:incoming_chmod => param_hash[:incoming_chmod], :outgoing_chmod => param_hash[:outgoing_chmod],
:outgoing_chmod => param_hash[:outgoing_chmod], :pipeline => param_hash[:object_pipeline] || ['object-server'],
:pipeline => param_hash[:object_pipeline] || ['object-server'], :splice => param_hash[:splice],
:splice => param_hash[:splice], :rsync_timeout => param_hash[:rsync_timeout],
:rsync_timeout => param_hash[:rsync_timeout], :rsync_bwlimit => param_hash[:rsync_bwlimit],
:rsync_bwlimit => param_hash[:rsync_bwlimit],
)} )}
it { is_expected.to contain_swift__storage__server(param_hash[:container_port]).with( it { is_expected.to contain_swift__storage__server(param_hash[:container_port]).with(
:type => 'container', :type => 'container',
:config_file_path => 'container-server.conf', :incoming_chmod => param_hash[:incoming_chmod],
:incoming_chmod => param_hash[:incoming_chmod], :outgoing_chmod => param_hash[:outgoing_chmod],
:outgoing_chmod => param_hash[:outgoing_chmod], :pipeline => param_hash[:container_pipeline] || ['container-server']
:pipeline => param_hash[:container_pipeline] || ['container-server']
)} )}
it { is_expected.to contain_class('rsync::server').with( it { is_expected.to contain_class('rsync::server').with(