openstack/puppet-swift
Code Issues Proposed changes

Remove redundant hard-codes from all

Browse Source 
This replaces redundant hard-codes in swift::storage::all by
$::os_service_default, so that we use service defaults in swift instead
of re-defining the same defaults in this module.

Change-Id: I9d81eb0ed15e0c5cc0f4b1ab1f5c0919ae501fe0
This commit is contained in:
Takashi Kajinami
2022-09-04 20:09:47 +09:00
parent e6ceaf6d51
commit ce43aca13d
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
manifests/storage/all.pp
View File

@@ -74,21 +74,21 @@
#
# [*log_statsd_port*]
# (optional) statsd port to send data to.
# Defaults to 8125
# Default to $::os_service_default.
#
# [*log_statsd_default_sample_rate*]
# (optional) Default sample rate for data. This should be a number between 0
# and 1. According to the documentation this should be set to 1 and the
# sample rate factor should be adjusted.
# Defaults to '1.0'
# Default to $::os_service_default.
#
# [*log_statsd_sample_rate_factor*]
# (optional) sample rate factor for data.
# Defaults to '1.0'
# Default to $::os_service_default.
#
# [*log_statsd_metric_prefix*]
# (optional) Prefix for data being sent to statsd.
# Defaults to ''
# Default to $::os_service_default.
#
# [*account_server_workers*]
# (optional) Number of account server workers.
@@ -108,16 +108,16 @@
#
# [*rsync_timeout*]
# (optional) Max duration of a partition rsync.
# Default to 900.
# Default to $::os_service_default.
#
# [*rsync_bwlimit*]
# (optional) Bandwidth limit for rsync in kB/s. 0 means unlimited.
# Default to 0.
# Default to $::os_service_default.
#
# [*splice*]
# (optional) Use splice for zero-copy object GETs. This requires Linux Kernel
# version 3.0 or greater.
# Defaults to false.
# Default to $::os_service_default.
#
# [*max_connections*]
# (optional) maximum number of simultaneous connections allowed for rsync.
@@ -146,16 +146,16 @@ class swift::storage::all(
$outgoing_chmod = 'Du=rwx,g=rx,o=rx,Fu=rw,g=r,o=r',
$statsd_enabled = false,
$log_statsd_host = 'localhost',
$log_statsd_port = 8125,
$log_statsd_default_sample_rate = '1.0',
$log_statsd_sample_rate_factor = '1.0',
$log_statsd_metric_prefix = '',
$log_statsd_port = $::os_service_default,
$log_statsd_default_sample_rate = $::os_service_default,
$log_statsd_sample_rate_factor = $::os_service_default,
$log_statsd_metric_prefix = $::os_service_default,
$account_server_workers = $::os_workers,
$container_server_workers = $::os_workers,
$object_server_workers = $::os_workers,
$object_server_mb_per_sync = 512,
$rsync_timeout = 900,
$rsync_bwlimit = 0,
$object_server_mb_per_sync = $::os_service_default,
$rsync_timeout = $::os_service_default,
$rsync_bwlimit = $::os_service_default,
$splice = false,
$max_connections = 25,
$rsync_use_xinetd = $::swift::params::xinetd_available,

4
spec/classes/swift_storage_all_spec.rb
View File

@@ -19,8 +19,8 @@ describe 'swift::storage::all' do
:outgoing_chmod => 'Du=rwx,g=rx,o=rx,Fu=rw,g=r,o=r',
:log_requests => true,
:max_connections => 25,
:rsync_timeout => 900,
:rsync_bwlimit => 0
:rsync_timeout => '<SERVICE DEFAULT>',
:rsync_bwlimit => '<SERVICE DEFAULT>'
}
end