Remove deprecated allow_versions
... because the parameters were deprecated during Yoga cycle[1].
[1] a1088139ec
Change-Id: I237aa3196d24a287fd891c0a818dfd20bfd64d04
This commit is contained in:
parent
718155cc22
commit
e004e46273
|
@ -127,12 +127,6 @@
|
|||
# (optional) Override whether to use xinetd to manage rsync service
|
||||
# Defaults to swift::params::xinetd_available
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*allow_versions*]
|
||||
# (optional) Enable/Disable object versioning feature
|
||||
# Defaults to undef
|
||||
#
|
||||
class swift::storage::all(
|
||||
$storage_local_net_ip,
|
||||
$devices = '/srv/node',
|
||||
|
@ -165,16 +159,10 @@ class swift::storage::all(
|
|||
$splice = false,
|
||||
$max_connections = 25,
|
||||
$rsync_use_xinetd = $::swift::params::xinetd_available,
|
||||
# DEPRECATED PARAMETERS
|
||||
$allow_versions = undef,
|
||||
) inherits swift::params {
|
||||
|
||||
include swift::deps
|
||||
|
||||
if $allow_versions != undef {
|
||||
warning('The allow_versions parameter is deprecated and will be removed in a future release')
|
||||
}
|
||||
|
||||
if ("${$object_port}" == '6000') {
|
||||
warning('The default port for the object storage server has changed \
|
||||
from 6000 to 6200 and will be changed in a later release')
|
||||
|
@ -231,7 +219,6 @@ from 6002 to 6202 and will be changed in a later release')
|
|||
config_file_path => 'container-server.conf',
|
||||
pipeline => $container_pipeline,
|
||||
log_facility => $log_facility,
|
||||
allow_versions => $allow_versions,
|
||||
log_requests => $log_requests,
|
||||
incoming_chmod => $incoming_chmod,
|
||||
outgoing_chmod => $outgoing_chmod,
|
||||
|
|
|
@ -191,12 +191,6 @@
|
|||
# (optional) Time in seconds to wait between sharder cycles.
|
||||
# Default to 30.
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*allow_versions*]
|
||||
# (optional) Enable/Disable object versioning feature
|
||||
# Defaults to undef.
|
||||
#
|
||||
define swift::storage::server(
|
||||
$type,
|
||||
$storage_local_net_ip,
|
||||
|
@ -243,8 +237,6 @@ define swift::storage::server(
|
|||
$container_sharder_auto_shard = false,
|
||||
$container_sharder_concurrency = 8,
|
||||
$container_sharder_interval = 30,
|
||||
# DEPRECATED PARAMETERS
|
||||
$allow_versions = undef,
|
||||
){
|
||||
|
||||
include swift::deps
|
||||
|
@ -252,10 +244,6 @@ define swift::storage::server(
|
|||
|
||||
$user_real = pick($user, $::swift::params::user)
|
||||
|
||||
if $allow_versions != undef {
|
||||
warning('The allow_versions parameter is deprecated and will be removed in a future release')
|
||||
}
|
||||
|
||||
if ($incoming_chmod == '0644') {
|
||||
warning('The default incoming_chmod set to 0644 may yield in error prone directories and will be changed in a later release.')
|
||||
}
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
The following two parameters have been removed.
|
||||
|
||||
- ``swift::storage::all::allow_versions``
|
||||
- ``swift::storage::server::allow_versions``
|
||||
|
|
@ -115,10 +115,7 @@ describe 'swift::storage::server' do
|
|||
end
|
||||
|
||||
if t == 'container'
|
||||
describe "when allow_versioning is set" do
|
||||
let :params do req_params.merge({ :allow_versions => false, }) end
|
||||
it { is_expected.to contain_concat_fragment("swift-#{t}-#{title}").with_content(/\[app:container-server\]\nallow_versions\s*=\s*false\s*$/m) }
|
||||
end
|
||||
# Nothing to test now
|
||||
end
|
||||
|
||||
if t == 'object'
|
||||
|
|
|
@ -29,9 +29,6 @@ log_statsd_metric_prefix = <%=@log_statsd_metric_prefix%>
|
|||
pipeline = <%= @pipeline.to_a.join(' ') %>
|
||||
|
||||
[app:container-server]
|
||||
<%- if ! @allow_versions.nil? -%>
|
||||
allow_versions = <%= @allow_versions %>
|
||||
<%- end -%>
|
||||
use = egg:swift#container
|
||||
set log_name = <%= @log_name %>
|
||||
set log_facility = <%= @log_facility %>
|
||||
|
|
Loading…
Reference in New Issue