Avoid deprecated config_file_path
This parameter was deprecated[1] and has no effect.
[1] bb656e5ee8
Change-Id: I8f18e65ea9466a9033084bc5bd3e91c520bccb6e
This commit is contained in:
parent
3af1a20fe0
commit
f5be5ea566
|
@ -221,21 +221,18 @@ from 6002 to 6202 and will be changed in a later release")
|
|||
|
||||
swift::storage::server { "${account_port}":
|
||||
type => 'account',
|
||||
config_file_path => 'account-server.conf',
|
||||
pipeline => $account_pipeline,
|
||||
workers => $account_server_workers,
|
||||
}
|
||||
|
||||
swift::storage::server { "${container_port}":
|
||||
type => 'container',
|
||||
config_file_path => 'container-server.conf',
|
||||
pipeline => $container_pipeline,
|
||||
workers => $container_server_workers,
|
||||
}
|
||||
|
||||
swift::storage::server { "${object_port}":
|
||||
type => 'object',
|
||||
config_file_path => 'object-server.conf',
|
||||
pipeline => $object_pipeline,
|
||||
workers => $object_server_workers,
|
||||
splice => $splice,
|
||||
|
|
|
@ -64,7 +64,6 @@ define swift::storage::node(
|
|||
|
||||
swift::storage::server { "60${name}0":
|
||||
type => 'object',
|
||||
config_file_path => 'object-server.conf',
|
||||
}
|
||||
|
||||
$ring_host = normalize_ip_for_uri($storage_local_net_ip)
|
||||
|
@ -82,7 +81,6 @@ define swift::storage::node(
|
|||
|
||||
swift::storage::server { "60${name}1":
|
||||
type => 'container',
|
||||
config_file_path => 'container-server.conf',
|
||||
}
|
||||
ring_container_device { "${ring_host}:60${name}1/${name}":
|
||||
zone => $zone,
|
||||
|
@ -91,7 +89,6 @@ define swift::storage::node(
|
|||
|
||||
swift::storage::server { "60${name}2":
|
||||
type => 'account',
|
||||
config_file_path => 'account-server.conf',
|
||||
}
|
||||
ring_account_device { "${ring_host}:60${name}2/${name}":
|
||||
zone => $zone,
|
||||
|
|
|
@ -82,14 +82,12 @@ describe 'swift::storage::all' do
|
|||
|
||||
it { is_expected.to contain_swift__storage__server(param_hash[:account_port]).with(
|
||||
:type => 'account',
|
||||
:config_file_path => 'account-server.conf',
|
||||
:incoming_chmod => param_hash[:incoming_chmod],
|
||||
:outgoing_chmod => param_hash[:outgoing_chmod],
|
||||
:pipeline => param_hash[:account_pipeline] || ['account-server']
|
||||
)}
|
||||
it { is_expected.to contain_swift__storage__server(param_hash[:object_port]).with(
|
||||
:type => 'object',
|
||||
:config_file_path => 'object-server.conf',
|
||||
:incoming_chmod => param_hash[:incoming_chmod],
|
||||
:outgoing_chmod => param_hash[:outgoing_chmod],
|
||||
:pipeline => param_hash[:object_pipeline] || ['object-server'],
|
||||
|
@ -99,7 +97,6 @@ describe 'swift::storage::all' do
|
|||
)}
|
||||
it { is_expected.to contain_swift__storage__server(param_hash[:container_port]).with(
|
||||
:type => 'container',
|
||||
:config_file_path => 'container-server.conf',
|
||||
:incoming_chmod => param_hash[:incoming_chmod],
|
||||
:outgoing_chmod => param_hash[:outgoing_chmod],
|
||||
:pipeline => param_hash[:container_pipeline] || ['container-server']
|
||||
|
|
Loading…
Reference in New Issue