openstack/puppet-swift
Code Issues Proposed changes

Replace legacy facts and use fact hash

Browse Source 
... because the latest lint no longer allows usage of legacy facts and
top scope fact.

Change-Id: I4c0a9357fcc4184df852024e1f6f36c0ed2e1440
This commit is contained in:
Takashi Kajinami 2023-03-02 12:49:54 +09:00
parent 76d421cc07
commit 109cd356de
51 changed files with 443 additions and 448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
manifests/constraints.pp
View File

@ -21,82 +21,82 @@
#
# [*max_file_size*]
# (Optional) The largest "normal" object that can be saved in the cluster.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*max_meta_name_length*]
# (Optional) Max number of bytes in the utf8 encoding of the name portion of
# a metadata header.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*max_meta_value_length*]
# (Optional) Max number of bytes in the utf8 encoding of a metadata value.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*max_meta_count*]
# (Optional) Max number of metadata keys that can be store on a single
# account, container or object.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*max_meta_overall_size*]
# (Optional) The max number of bytes in the utf8 encoding of the metadata.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*max_header_size*]
# (Optional) Max HTTP header size for incoming requests for all swift
# services.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*extra_header_count*]
# (Optional) Allow additional headers in addition to max allowed metadata
# plus a default value of 36 for swift internally generated headers and
# regular http headers.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*max_object_name_length*]
# (Optional) Max number of bytes in the utf8 encoding of an object name.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*container_listing_limit*]
# (Optional) Default (and max) number of items returned for a container
# listing request.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*account_listing_limit*]
# (Optional) Default (and max) number of items returned for an account
# listing request.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*max_account_name_length*]
# (Optional) Max number of bytes in the utf8 encoding of an account name.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*max_container_name_length*]
# (Optional) Max number of bytes in the utf8 encoding of a container name.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*valid_api_versions*]
# (Optional) Allowed version strings for all REST API calls.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*auto_create_account_prefix*]
# (Optional) Prefix used for hiddne auto-created accounts.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class swift::constraints(
$max_file_size = $::os_service_default,
$max_meta_name_length = $::os_service_default,
$max_meta_value_length = $::os_service_default,
$max_meta_count = $::os_service_default,
$max_meta_overall_size = $::os_service_default,
$max_header_size = $::os_service_default,
$extra_header_count = $::os_service_default,
$max_object_name_length = $::os_service_default,
$container_listing_limit = $::os_service_default,
$account_listing_limit = $::os_service_default,
$max_account_name_length = $::os_service_default,
$max_container_name_length = $::os_service_default,
$valid_api_versions = $::os_service_default,
$auto_create_account_prefix = $::os_service_default,
$max_file_size = $facts['os_service_default'],
$max_meta_name_length = $facts['os_service_default'],
$max_meta_value_length = $facts['os_service_default'],
$max_meta_count = $facts['os_service_default'],
$max_meta_overall_size = $facts['os_service_default'],
$max_header_size = $facts['os_service_default'],
$extra_header_count = $facts['os_service_default'],
$max_object_name_length = $facts['os_service_default'],
$container_listing_limit = $facts['os_service_default'],
$account_listing_limit = $facts['os_service_default'],
$max_account_name_length = $facts['os_service_default'],
$max_container_name_length = $facts['os_service_default'],
$valid_api_versions = $facts['os_service_default'],
$auto_create_account_prefix = $facts['os_service_default'],
) {
include swift::deps

24
manifests/containerreconciler.pp
View File

@ -20,17 +20,17 @@
#
# [*interval*]
# (optional) Minimum time for a pass to take, in seconds.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*reclaim_age*]
# (optional) The reconciler will re-attempt reconciliation if the source
# object is not available up to reclaim_age seconds before it gives up and
# deletes the entry in the queue.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*request_tries*]
# (optional) Server errors from requests will be retried by default
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*service_provider*]
# (optional)
@ -57,7 +57,7 @@
# (Optional) Path to a file of concatenated CA certificates in PEM
# format necessary to establish the caching server's authenticity.
# If tls_enabled is False, this option is ignored.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*cache_tls_certfile*]
# (Optional) Path to a single file in PEM format containing the
@ -65,29 +65,29 @@
# needed to establish the certificate's authenticity. This file
# is only required when client side authentication is necessary.
# If tls_enabled is False, this option is ignored.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*cache_tls_keyfile*]
# (Optional) Path to a single file containing the client's private
# key in. Otherwise the private key will be taken from the file
# specified in tls_certfile. If tls_enabled is False, this option
# is ignored.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class swift::containerreconciler(
$manage_service = true,
$enabled = true,
$package_ensure = 'present',
$pipeline = ['catch_errors', 'proxy-logging', 'proxy-server'],
$interval = $::os_service_default,
$reclaim_age = $::os_service_default,
$request_tries = $::os_service_default,
$interval = $facts['os_service_default'],
$reclaim_age = $facts['os_service_default'],
$request_tries = $facts['os_service_default'],
$service_provider = $::swift::params::service_provider,
$memcache_servers = ['127.0.0.1:11211'],
$cache_tls_enabled = false,
$cache_tls_cafile = $::os_service_default,
$cache_tls_certfile = $::os_service_default,
$cache_tls_keyfile = $::os_service_default,
$cache_tls_cafile = $facts['os_service_default'],
$cache_tls_certfile = $facts['os_service_default'],
$cache_tls_keyfile = $facts['os_service_default'],
) inherits swift::params {
include swift::deps

4
manifests/init.pp
View File

@ -47,8 +47,8 @@
# Copyright 2011 Puppetlabs Inc, unless otherwise noted.
#
class swift(
$swift_hash_path_suffix = $::os_service_default,
$swift_hash_path_prefix = $::os_service_default,
$swift_hash_path_suffix = $facts['os_service_default'],
$swift_hash_path_prefix = $facts['os_service_default'],
$package_ensure = 'present',
# DEPRECATED PARAMETERS
$max_header_size = undef

32
manifests/internal_client.pp
View File

@ -14,11 +14,11 @@
#
# [*object_chunk_size*]
# (optional) Chunk size to read from object servers.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*client_chunk_size*]
# (optional) Chunk size to read from clients.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*read_affinity*]
# (optional) Configures the read affinity of internal client.
@ -26,36 +26,36 @@
#
# [*write_affinity*]
# (optional) Configures the write affinity of internal client.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*write_affinity_node_count*]
# (optional) Configures write_affinity_node_count for internal client.
# Optional but requires write_affinity to be set.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*client_timeout*]
# (optional) Configures client_timeout for internal client.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*node_timeout*]
# (optional) Configures node_timeout for internal client.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*recoverable_node_timeout*]
# (optional) Configures recoverable_node_timeout for internal client.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class swift::internal_client (
$user = $::swift::params::user,
$pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'],
$object_chunk_size = $::os_service_default,
$client_chunk_size = $::os_service_default,
$object_chunk_size = $facts['os_service_default'],
$client_chunk_size = $facts['os_service_default'],
$read_affinity = undef,
$write_affinity = $::os_service_default,
$write_affinity_node_count = $::os_service_default,
$client_timeout = $::os_service_default,
$node_timeout = $::os_service_default,
$recoverable_node_timeout = $::os_service_default,
$write_affinity = $facts['os_service_default'],
$write_affinity_node_count = $facts['os_service_default'],
$client_timeout = $facts['os_service_default'],
$node_timeout = $facts['os_service_default'],
$recoverable_node_timeout = $facts['os_service_default'],
) inherits swift::params {
include swift::deps
@ -87,8 +87,8 @@ class swift::internal_client (
}
} else {
swift_internal_client_config {
'app:proxy-server/sorting_method': value => $::os_service_default;
'app:proxy-server/read_affinity': value => $::os_service_default;
'app:proxy-server/sorting_method': value => $facts['os_service_default'];
'app:proxy-server/read_affinity': value => $facts['os_service_default'];
}
}

4
manifests/internal_client/symlink.pp
View File

@ -23,14 +23,14 @@
# chain does not exceed the symloop_max value. If the number of chained
# symlinks exceeds the limit symloop_max a 409 (HTTPConflict) error
# response will be produced.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# == Authors
#
# shi.yan@ardc.edu.au
#
class swift::internal_client::symlink(
$symloop_max = $::os_service_default,
$symloop_max = $facts['os_service_default'],
) {
include swift::deps

4
manifests/keymaster.pp
View File

@ -58,7 +58,7 @@
#
# [*meta_version_to_write*]
# (Optional) Int. The version of crypto metadata to write.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# == Dependencies
#
@ -80,7 +80,7 @@ class swift::keymaster(
$user_domain_name = undef,
$project_domain_id = 'default',
$user_domain_id = 'default',
$meta_version_to_write = $::os_service_default,
$meta_version_to_write = $facts['os_service_default'],
) {
include swift::deps

24
manifests/memcache.pp
View File

@ -32,27 +32,27 @@
# upgrade with 0, then set to 1 and reload, then after some time (24 hours)
# set to 2 and reload.
# In the future, the ability to use pickle serialization will be removed.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*memcache_max_connections*]
# Sets the maximum number of connections to each memcached server per worker
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*connect_timeout*]
# Timeout for connection
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*pool_timeout*]
# Timeout for pooled connection
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*tries*]
# number of servers to retry on failures getting a pooled connection
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*io_timeout*]
# Timeout for read and writes
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
#
# === Authors
@ -61,12 +61,12 @@
#
class swift::memcache (
$memcache_servers = ['127.0.0.1:11211'],
$memcache_serialization_support = $::os_service_default,
$memcache_max_connections = $::os_service_default,
$connect_timeout = $::os_service_default,
$pool_timeout = $::os_service_default,
$tries = $::os_service_default,
$io_timeout = $::os_service_default,
$memcache_serialization_support = $facts['os_service_default'],
$memcache_max_connections = $facts['os_service_default'],
$connect_timeout = $facts['os_service_default'],
$pool_timeout = $facts['os_service_default'],
$tries = $facts['os_service_default'],
$io_timeout = $facts['os_service_default'],
) {
include swift::deps

34
manifests/objectexpirer.pp
View File

@ -19,38 +19,38 @@
#
# [*concurrency*]
# (optional) Number of replication workers to spawn.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*expiring_objects_account_name*]
# (optional) Account name used for expiring objects.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*interval*]
# (optional) Minimum time for a pass to take, in seconds.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*process*]
# (optional) Which part of the work defined by $processes
# will this instance take.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*processes*]
# (optional) How many parts to divide the work into, one part per
# process. 0 means a single process will do all work.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*reclaim_age*]
# (optional) Time elapsed in seconds before an object can be
# reclaimed.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*recon_cache_path*]
# (optional) Directory where stats for a few items will be stored.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*report_interval*]
# (optional) Report interval, in seconds.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*service_provider*]
# (optional)
@ -112,14 +112,14 @@ class swift::objectexpirer(
$enabled = true,
$package_ensure = 'present',
$pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'],
$concurrency = $::os_service_default,
$expiring_objects_account_name = $::os_service_default,
$interval = $::os_service_default,
$process = $::os_service_default,
$processes = $::os_service_default,
$reclaim_age = $::os_service_default,
$recon_cache_path = $::os_service_default,
$report_interval = $::os_service_default,
$concurrency = $facts['os_service_default'],
$expiring_objects_account_name = $facts['os_service_default'],
$interval = $facts['os_service_default'],
$process = $facts['os_service_default'],
$processes = $facts['os_service_default'],
$reclaim_age = $facts['os_service_default'],
$recon_cache_path = $facts['os_service_default'],
$report_interval = $facts['os_service_default'],
$service_provider = $::swift::params::service_provider,
$memcache_servers = ['127.0.0.1:11211'],
$cache_tls_enabled = false,
@ -181,7 +181,7 @@ class swift::objectexpirer(
swift_object_expirer_config {
'pipeline:main/pipeline': value => join($pipeline, ' ');
'object-expirer/auto_create_account_prefix': value => pick($auto_create_account_prefix, $::os_service_default);
'object-expirer/auto_create_account_prefix': value => pick($auto_create_account_prefix, $facts['os_service_default']);
'object-expirer/concurrency': value => $concurrency;
'object-expirer/expiring_objects_account_name': value => $expiring_objects_account_name;
'object-expirer/interval': value => $interval;

5
manifests/params.pp
View File

@ -11,7 +11,7 @@ class swift::params {
$user = 'swift'
$group = 'swift'
case $::osfamily {
case $facts['os']['family'] {
'Debian': {
$package_name = 'swift'
$proxy_package_name = 'swift-proxy'
@ -69,8 +69,7 @@ class swift::params {
$xinetd_available = false
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \
module ${module_name} only support osfamily RedHat and Debian")
fail("Unsupported osfamily: ${facts['os']['family']}")
}
}
$swift_init_service_names = [

50
manifests/proxy.pp
View File

@ -27,7 +27,7 @@
#
# [*workers*]
# (optional) Number of threads to process requests.
# Defaults to $::os_workers.
# Defaults to $facts['os_workers'].
#
# [*allow_account_management*]
# (optional) Rather or not requests through this proxy can create and
@ -65,15 +65,15 @@
#
# [*log_handoffs*]
# (optional) If True, the proxy will log whenever it has to failover to a handoff node
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*object_chunk_size*]
# (optional) Chunk size to read from object servers.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*client_chunk_size*]
# (optional) Chunk size to read from clients.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_containers_per_account*]
# (optional) If set to a positive value, will limit container number per account.
@ -81,7 +81,7 @@
#
# [*max_containers_whitelist*]
# (optional) This is a comma separated list of account hashes that ignore the max_containers_per_account cap.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*read_affinity*]
# (optional) Configures the read affinity of proxy-server.
@ -94,19 +94,19 @@
# [*write_affinity_node_count*]
# (optional) Configures write_affinity_node_count for proxy-server.
# Optional but requires write_affinity to be set.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*client_timeout*]
# (optional) Configures client_timeout for swift proxy-server.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*node_timeout*]
# (optional) Configures node_timeout for swift proxy-server
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*recoverable_node_timeout*]
# (optional) Configures recoverable_node_timeout for swift proxy-server
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*enabled*]
# (optional) Should the service be enabled.
@ -161,7 +161,7 @@ class swift::proxy(
$pipeline = [
'catch_errors', 'gatekeeper', 'healthcheck', 'proxy-logging', 'cache',
'listing_formats', 'tempauth', 'copy', 'proxy-logging', 'proxy-server'],
$workers = $::os_workers,
$workers = $facts['os_workers'],
$allow_account_management = true,
$account_autocreate = true,
$log_headers = 'False',
@ -170,20 +170,20 @@ class swift::proxy(
$log_address = '/dev/log',
$log_level = 'INFO',
$log_facility = 'LOG_LOCAL2',
$log_handoffs = $::os_service_default,
$log_handoffs = $facts['os_service_default'],
$log_name = 'proxy-server',
$cors_allow_origin = undef,
$strict_cors_mode = true,
$object_chunk_size = $::os_service_default,
$client_chunk_size = $::os_service_default,
$max_containers_per_account = $::os_service_default,
$max_containers_whitelist = $::os_service_default,
$object_chunk_size = $facts['os_service_default'],
$client_chunk_size = $facts['os_service_default'],
$max_containers_per_account = $facts['os_service_default'],
$max_containers_whitelist = $facts['os_service_default'],
$read_affinity = undef,
$write_affinity = undef,
$write_affinity_node_count = $::os_service_default,
$client_timeout = $::os_service_default,
$node_timeout = $::os_service_default,
$recoverable_node_timeout = $::os_service_default,
$write_affinity_node_count = $facts['os_service_default'],
$client_timeout = $facts['os_service_default'],
$node_timeout = $facts['os_service_default'],
$recoverable_node_timeout = $facts['os_service_default'],
$manage_service = true,
$enabled = true,
$package_ensure = 'present',
@ -271,8 +271,8 @@ class swift::proxy(
}
} else {
swift_proxy_config {
'DEFAULT/cors_allow_origin': value => $::os_service_default;
'DEFAULT/strict_cors_mode': value => $::os_service_default;
'DEFAULT/cors_allow_origin': value => $facts['os_service_default'];
'DEFAULT/strict_cors_mode': value => $facts['os_service_default'];
}
}
@ -283,8 +283,8 @@ class swift::proxy(
}
} else {
swift_proxy_config {
'app:proxy-server/write_affinity': value => $::os_service_default;
'app:proxy-server/write_affinity_node_count': value => $::os_service_default;
'app:proxy-server/write_affinity': value => $facts['os_service_default'];
'app:proxy-server/write_affinity_node_count': value => $facts['os_service_default'];
}
}
@ -295,8 +295,8 @@ class swift::proxy(
}
} else {
swift_proxy_config {
'app:proxy-server/sorting_method': value => $::os_service_default;
'app:proxy-server/read_affinity': value => $::os_service_default;
'app:proxy-server/sorting_method': value => $facts['os_service_default'];
'app:proxy-server/read_affinity': value => $facts['os_service_default'];
}
}

28
manifests/proxy/authtoken.pp
View File

@ -47,11 +47,11 @@
#
# [*system_scope*]
# (Optional) Scope for system operations
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*region_name*]
# (Optional) The region in which the identity server can be found.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*include_service_catalog*]
# (Optional) Indicate whether to set the X-Service-Catalog header. If False,
@ -67,23 +67,23 @@
# here are applied as an ANY check so any role in this list
# must be present. For backwards compatibility reasons this
# currently only affects the allow_expired check. (list value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*service_token_roles_required*]
# (optional) backwards compatibility to ensure that the service tokens are
# compared against a list of possible roles for validity
# true/false
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*service_type*]
# (Optional) The name or type of the service as it appears in the service
# catalog. This is used to validate tokens that have restricted access rules.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*interface*]
# (Optional) Interface to use for the Identity API endpoint. Valid values are
# "public", "internal" or "admin".
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# == Authors
#
@ -104,13 +104,13 @@ class swift::proxy::authtoken(
$password = undef,
$project_name = 'services',
$project_domain_id = 'default',
$system_scope = $::os_service_default,
$region_name = $::os_service_default,
$system_scope = $facts['os_service_default'],
$region_name = $facts['os_service_default'],
$include_service_catalog = false,
$service_token_roles = $::os_service_default,
$service_token_roles_required = $::os_service_default,
$service_type = $::os_service_default,
$interface = $::os_service_default,
$service_token_roles = $facts['os_service_default'],
$service_token_roles_required = $facts['os_service_default'],
$service_type = $facts['os_service_default'],
$interface = $facts['os_service_default'],
) inherits swift::params {
include swift::deps
@ -127,8 +127,8 @@ Please set password parameter')
$project_name_real = $project_name
$project_domain_id_real = $project_domain_id
} else {
$project_name_real = $::os_service_default
$project_domain_id_real = $::os_service_default
$project_name_real = $facts['os_service_default']
$project_domain_id_real = $facts['os_service_default']
}
swift_proxy_config {

28
manifests/proxy/bulk.pp
View File

@ -22,44 +22,44 @@
# [*max_containers_per_extraction*]
# (Optional) The maximum number of containers that can be extracted from
# an archive.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_failed_extractions*]
# (Optional) The maximum number of failed extractions allowed when an archive
# has extraction failures.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_failed_deletes*]
# (Optional) The maximum number of failed deletion allowed in a bulk delete
# of objects and their container.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*max_deletes_per_request*]
# (Optional) The maximum number of deletes allowed by each request.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*delete_container_retry_count*]
# (Optional) Number of retries to delete container in a bulk delete of
# objects and their container.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*delete_concurrency*]
# (Optional) The number of objects to delete at a time.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*yield_frequency*]
# (Optional) The frequency the server will spit out an ' ' to keep
# the connection alive while its processing the request.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class swift::proxy::bulk(
$max_containers_per_extraction = $::os_service_default,
$max_failed_extractions = $::os_service_default,
$max_failed_deletes = $::os_service_default,
$max_deletes_per_request = $::os_service_default,
$delete_container_retry_count = $::os_service_default,
$delete_concurrency = $::os_service_default,
$yield_frequency = $::os_service_default,
$max_containers_per_extraction = $facts['os_service_default'],
$max_failed_extractions = $facts['os_service_default'],
$max_failed_deletes = $facts['os_service_default'],
$max_deletes_per_request = $facts['os_service_default'],
$delete_container_retry_count = $facts['os_service_default'],
$delete_concurrency = $facts['os_service_default'],
$yield_frequency = $facts['os_service_default'],
) {
include swift::deps

76
manifests/proxy/ceilometer.pp
View File

@ -11,7 +11,7 @@
# (optional) A URL representing the messaging driver to use and its full
# configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*driver*]
# (Optional) The Drivers(s) to handle sending notifications.
@ -55,7 +55,7 @@
#
# [*system_scope*]
# (Optional) Scope for system operations
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*username*]
# (Optional) The name of the service user
@ -71,50 +71,50 @@
#
# [*region_name*]
# (Optional) The region in which the identity server can be found.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*notification_ssl_ca_file*]
# (optional) SSL certification authority file (valid only if SSL enabled).
# (string value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*notification_ssl_cert_file*]
# (optional) SSL cert file. (string value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*notification_ssl_key_file*]
# (optional) SSL key file. (string value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*amqp_ssl_key_password*]
# (Optional) Password for decrypting ssl_key_file (if encrypted)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*rabbit_use_ssl*]
# (Optional) Connect over SSL for RabbitMQ. (boolean value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_version*]
# (optional) SSL version to use (valid only if SSL enabled).
# Valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be
# available on some distributions. (string value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_ha_queues*]
# (Optional) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this
# option, you must wipe the RabbitMQ database. (boolean value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_heartbeat_timeout_threshold*]
# (Optional) Number of seconds after which the Rabbit broker is
# considered down if heartbeat's keep-alive fails
# (0 disable the heartbeat). EXPERIMENTAL. (integer value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_heartbeat_rate*]
# (Optional) How often times during the heartbeat_timeout_threshold
# we check the heartbeat. (integer value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_heartbeat_in_pthread*]
# (Optional) EXPERIMENTAL: Run the health check heartbeat thread
@ -124,32 +124,32 @@
# example if the parent process have monkey patched the
# stdlib by using eventlet/greenlet then the heartbeat
# will be run through a green thread.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_qos_prefetch_count*]
# (Optional) Specifies the number of messages to prefetch.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*amqp_durable_queues*]
# (optional) Define queues as "durable" to rabbitmq.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_reconnect_delay*]
# (Optional) How long to wait before reconnecting in response
# to an AMQP consumer cancel notification. (floating point value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_failover_strategy*]
# (Optional) Determines how the next RabbitMQ node is chosen in case the one
# we are currently connected to becomes unavailable. Takes effect only if
# more than one RabbitMQ node is provided in config. (string value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_compression*]
# (optional) Possible values are: gzip, bz2. If not set compression will not
# be used. This option may notbe available in future versions. EXPERIMENTAL.
# (string value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# == Examples
#
@ -163,7 +163,7 @@
#
class swift::proxy::ceilometer(
$default_transport_url = undef,
$driver = $::os_service_default,
$driver = $facts['os_service_default'],
$topic = undef,
$control_exchange = undef,
$ensure = 'present',
@ -173,26 +173,26 @@ class swift::proxy::ceilometer(
$auth_type = 'password',
$project_name = 'services',
$project_domain_name = 'Default',
$system_scope = $::os_service_default,
$system_scope = $facts['os_service_default'],
$username = 'swift',
$user_domain_name = 'Default',
$password = undef,
$region_name = $::os_service_default,
$notification_ssl_ca_file = $::os_service_default,
$notification_ssl_cert_file = $::os_service_default,
$notification_ssl_key_file = $::os_service_default,
$amqp_ssl_key_password = $::os_service_default,
$rabbit_use_ssl = $::os_service_default,
$kombu_ssl_version = $::os_service_default,
$rabbit_ha_queues = $::os_service_default,
$rabbit_heartbeat_timeout_threshold = $::os_service_default,
$rabbit_heartbeat_rate = $::os_service_default,
$rabbit_heartbeat_in_pthread = $::os_service_default,
$rabbit_qos_prefetch_count = $::os_service_default,
$amqp_durable_queues = $::os_service_default,
$kombu_reconnect_delay = $::os_service_default,
$kombu_failover_strategy = $::os_service_default,
$kombu_compression = $::os_service_default,
$region_name = $facts['os_service_default'],
$notification_ssl_ca_file = $facts['os_service_default'],
$notification_ssl_cert_file = $facts['os_service_default'],
$notification_ssl_key_file = $facts['os_service_default'],
$amqp_ssl_key_password = $facts['os_service_default'],
$rabbit_use_ssl = $facts['os_service_default'],
$kombu_ssl_version = $facts['os_service_default'],
$rabbit_ha_queues = $facts['os_service_default'],
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
$rabbit_heartbeat_rate = $facts['os_service_default'],
$rabbit_heartbeat_in_pthread = $facts['os_service_default'],
$rabbit_qos_prefetch_count = $facts['os_service_default'],
$amqp_durable_queues = $facts['os_service_default'],
$kombu_reconnect_delay = $facts['os_service_default'],
$kombu_failover_strategy = $facts['os_service_default'],
$kombu_compression = $facts['os_service_default'],
) inherits swift {
include swift::deps
@ -211,8 +211,8 @@ Please set password parameter')
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name
} else {
$project_name_real = $::os_service_default
$project_domain_name_real = $::os_service_default
$project_name_real = $facts['os_service_default']
$project_domain_name_real = $facts['os_service_default']
}
swift_proxy_config {

32
manifests/proxy/cname_lookup.pp
View File

@ -6,51 +6,51 @@
#
# [*log_name*]
# The log name of cname_lookup.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*log_facility*]
# The log facility of cname_lookup.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*log_level*]
# The log level of cname_lookup.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*log_headers*]
# The log headers of cname_lookup.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*log_address*]
# The log address of cname_lookup.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*storage_domain*]
# Specify the storage_domain that match your cloud, multiple domains
# can be specified separated by a comma.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*lookup_depth*]
# Because CNAMES can be recursive, specifies the number of levels
# through which to search.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*nameservers*]
# Specify the nameservers to use to do the CNAME resolution. If unset, the
# system configuration is used. Multiple nameservers can be specified
# separated by a comma. Default port 53 can be overridden. IPv6 is accepted.
# Example: 127.0.0.1, 127.0.0.2, 127.0.0.3:5353, [::1], [::1]:5353
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
#
class swift::proxy::cname_lookup(
$log_name = $::os_service_default,
$log_facility = $::os_service_default,
$log_level = $::os_service_default,
$log_headers = $::os_service_default,
$log_address = $::os_service_default,
$storage_domain = $::os_service_default,
$lookup_depth = $::os_service_default,
$nameservers = $::os_service_default,
$log_name = $facts['os_service_default'],
$log_facility = $facts['os_service_default'],
$log_level = $facts['os_service_default'],
$log_headers = $facts['os_service_default'],
$log_address = $facts['os_service_default'],
$storage_domain = $facts['os_service_default'],
$lookup_depth = $facts['os_service_default'],
$nameservers = $facts['os_service_default'],
) {
include swift::deps

8
manifests/proxy/container_sync.pp
View File

@ -6,20 +6,20 @@
# [*allow_full_urls*]
# (Optional) Allow full URL values to be set for new X-Container-Sync-To
# headers.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*current*]
# (Optional) Set this to specify this clusters //realm/cluster as "current" in
# /info.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# == Authors
#
# Denis Egorenko <degorenko@mirantis.com>
#
class swift::proxy::container_sync(
$allow_full_urls = $::os_service_default,
$current = $::os_service_default,
$allow_full_urls = $facts['os_service_default'],
$current = $facts['os_service_default'],
) {
include swift::deps

12
manifests/proxy/dlo.pp
View File

@ -10,16 +10,16 @@
# [*rate_limit_after_segment*]
# (Optional) Start rate-limiting DLO segment serving after the Nth segment of
# a segmented object.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*rate_limit_segments_per_sec*]
# (Optional) Once segment rate-limiting kicks in for an object, limit segments
# served to N per second. 0 means no rate-limiting.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_get_time*]
# (Optional) Time limit on GET requests (seconds).
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# == Authors
#
@ -30,9 +30,9 @@
# Copyright 2015 Mirantis Inc, unless otherwise noted.
#
class swift::proxy::dlo (
$rate_limit_after_segment = $::os_service_default,
$rate_limit_segments_per_sec = $::os_service_default,
$max_get_time = $::os_service_default,
$rate_limit_after_segment = $facts['os_service_default'],
$rate_limit_segments_per_sec = $facts['os_service_default'],
$max_get_time = $facts['os_service_default'],
) {
include swift::deps

40
manifests/proxy/domain_remap.pp
View File

@ -20,47 +20,47 @@
#
# [*log_name*]
# The log name of domain_remap.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*log_facility*]
# The log facility of domain_remap.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*log_level*]
# The log level of domain_remap.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*log_headers*]
# The log headers of domain_remap.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*log_address*]
# The log address of domain_remap.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*storage_domain*]
# Specify the storage_domain that match your cloud, multiple domains
# can be specified separated by a comma.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*path_root*]
# Specify a root path part that will be added to the start of paths if not
# already present.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*reseller_prefixes*]
# A list of reseller_prefixes to lookup a reseller_prefix
# from the given account name.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*default_reseller_prefix*]
# The default reseller_prefix.
# It will be used if none of reseller_prefixes match
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*mangle_client_paths*]
# Enable legacy remapping behavior for versioned path requests.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# == Authors
#
@ -68,16 +68,16 @@
#
#
class swift::proxy::domain_remap(
$log_name = $::os_service_default,
$log_facility = $::os_service_default,
$log_level = $::os_service_default,
$log_headers = $::os_service_default,
$log_address = $::os_service_default,
$storage_domain = $::os_service_default,
$path_root = $::os_service_default,
$reseller_prefixes = $::os_service_default,
$default_reseller_prefix = $::os_service_default,
$mangle_client_paths = $::os_service_default,
$log_name = $facts['os_service_default'],
$log_facility = $facts['os_service_default'],
$log_level = $facts['os_service_default'],
$log_headers = $facts['os_service_default'],
$log_address = $facts['os_service_default'],
$storage_domain = $facts['os_service_default'],
$path_root = $facts['os_service_default'],
$reseller_prefixes = $facts['os_service_default'],
$default_reseller_prefix = $facts['os_service_default'],
$mangle_client_paths = $facts['os_service_default'],
) {
include swift::deps

4
manifests/proxy/etag_quoter.pp
View File

@ -5,7 +5,7 @@
#
# [*enabled_by_default*]
# Enable quoting ETag header cluster-wide by default.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# == Examples
#
@ -22,7 +22,7 @@
# Copyright (C) 2020 Red Hat
#
class swift::proxy::etag_quoter (
$enabled_by_default = $::os_service_default
$enabled_by_default = $facts['os_service_default']
) {
include swift::deps

8
manifests/proxy/gatekeeper.pp
View File

@ -9,13 +9,13 @@
#
# [*shunt_inbound_x_timestamp*]
# (Optional) Disallow clients to set arbitrary X-Timestamps on uploaded objects.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*allow_reserved_names_header*]
# (Optional) Allow clients to access and manipulate the null namespace by
# including a header like
# X-Allow-Reserved-Names: true
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*log_name*]
# (Optional) The log name of gatekeeper.
@ -46,8 +46,8 @@
# Copyright 2014 UnitedStack licensing@unitedstack.com
#
class swift::proxy::gatekeeper(
$shunt_inbound_x_timestamp = $::os_service_default,
$allow_reserved_names_header = $::os_service_default,
$shunt_inbound_x_timestamp = $facts['os_service_default'],
$allow_reserved_names_header = $facts['os_service_default'],
$log_name = 'gatekeeper',
$log_facility = 'LOG_LOCAL2',
$log_level = 'INFO',

8
manifests/proxy/keystone.pp
View File

@ -24,13 +24,13 @@
# Project reader roles are similar to account owners, but are not
# allowed to write any data.
# (Optional)
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*system_reader_roles*]
# System reader roles are similar to reseller_admin_roles, but are not
# allowed to write any data.
# (Optional)
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# == Authors
#
@ -41,8 +41,8 @@ class swift::proxy::keystone(
$operator_roles = ['admin', 'SwiftOperator'],
$reseller_prefix = 'AUTH_',
$reseller_admin_role = undef,
$project_reader_roles = $::os_service_default,
$system_reader_roles = $::os_service_default,
$project_reader_roles = $facts['os_service_default'],
$system_reader_roles = $facts['os_service_default'],
) {
include swift::deps

20
manifests/proxy/ratelimit.pp
View File

@ -9,23 +9,23 @@
# [*clock_accuracy*]
# (optional) The accuracy of swift proxy servers' clocks.
# 1000 is 1ms max difference. No rate should be higher than this.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_sleep_time_seconds*]
# (optional) Time before the app returns a 498 response.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*log_sleep_time_seconds*]
# (optional) if >0, enables logging of sleeps longer than the value.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*rate_buffer_seconds*]
# (optional) Time in second the rate counter can skip.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*account_ratelimit*]
# (optional) if >0, limits PUT and DELETE requests to containers
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*container_ratelimit*]
# (optional) Hash of size(keys) and requests per seconds(values).
@ -48,11 +48,11 @@
# Copyright 2012 eNovance licensing@enovance.com
#
class swift::proxy::ratelimit(
$clock_accuracy = $::os_service_default,
$max_sleep_time_seconds = $::os_service_default,
$log_sleep_time_seconds = $::os_service_default,
$rate_buffer_seconds = $::os_service_default,
$account_ratelimit = $::os_service_default,
$clock_accuracy = $facts['os_service_default'],
$max_sleep_time_seconds = $facts['os_service_default'],
$log_sleep_time_seconds = $facts['os_service_default'],
$rate_buffer_seconds = $facts['os_service_default'],
$account_ratelimit = $facts['os_service_default'],
$container_ratelimit = {},
$container_listing_ratelimit = {},
) {

60
manifests/proxy/s3api.pp
View File

@ -7,41 +7,41 @@
#
# [*allow_no_owner*]
# Whether objects without owner information should be visible or not
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*location*]
# A region name of the swift cluster.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*dns_compliant_bucket_names*]
# Enforce DNS-compliant bucket names
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_bucket_listing*]
# The default maximum number of objects returned in the GET Bucket response.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_parts_listing*]
# The maximum number of parts returned in the List Parts operation.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_multi_delete_objects*]
# The maximum number of objects deleted with the Multi-Object Delete
# operation.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*multi_delete_concurrency*]
# The number of objects to delete at a time with the Multi-Object Delete
# operation.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*s3_acl*]
# Use own metadata for ACLs.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*storage_domain*]
# A host name of the Swift cluster
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*auth_pipeline_check*]
# Enable pipeline order check
@ -49,46 +49,46 @@
#
# [*allow_multipart_uploads*]
# Enable multi-part uploads.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_upload_part_num*]
# Max upload per num
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*check_bucket_owner*]
# Enable returning only buckets which owner are the user who requested
# GET Service operation.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*force_swift_request_proxy_log*]
# Output Swift style log in addition to S3 style log.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*min_segment_size*]
# Minimum size of each part in a multipart upload
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*log_name*]
# Override the default log routing for s3api middleware
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class swift::proxy::s3api(
$allow_no_owner = $::os_service_default,
$location = $::os_service_default,
$dns_compliant_bucket_names = $::os_service_default,
$max_bucket_listing = $::os_service_default,
$max_parts_listing = $::os_service_default,
$max_multi_delete_objects = $::os_service_default,
$multi_delete_concurrency = $::os_service_default,
$s3_acl = $::os_service_default,
$storage_domain = $::os_service_default,
$allow_no_owner = $facts['os_service_default'],
$location = $facts['os_service_default'],
$dns_compliant_bucket_names = $facts['os_service_default'],
$max_bucket_listing = $facts['os_service_default'],
$max_parts_listing = $facts['os_service_default'],
$max_multi_delete_objects = $facts['os_service_default'],
$multi_delete_concurrency = $facts['os_service_default'],
$s3_acl = $facts['os_service_default'],
$storage_domain = $facts['os_service_default'],
$auth_pipeline_check = false,
$allow_multipart_uploads = $::os_service_default,
$max_upload_part_num = $::os_service_default,
$check_bucket_owner = $::os_service_default,
$force_swift_request_proxy_log = $::os_service_default,
$min_segment_size = $::os_service_default,
$log_name = $::os_service_default,
$allow_multipart_uploads = $facts['os_service_default'],
$max_upload_part_num = $facts['os_service_default'],
$check_bucket_owner = $facts['os_service_default'],
$force_swift_request_proxy_log = $facts['os_service_default'],
$min_segment_size = $facts['os_service_default'],
$log_name = $facts['os_service_default'],
) {
include swift::deps

12
manifests/proxy/s3token.pp
View File

@ -21,7 +21,7 @@
# [*http_timeout*]
# Connection timeout to be used during communicating
# with Keystone
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*secret_cache_duration*]
# The number of seconds that secrets can be cached.
@ -67,7 +67,7 @@
#
# [*system_scope*]
# (Optional) Scope for system operations
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# == Dependencies
#
@ -85,7 +85,7 @@ class swift::proxy::s3token(
$auth_uri = 'http://127.0.0.1:5000',
$reseller_prefix = 'AUTH_',
$delay_auth_decision = false,
$http_timeout = $::os_service_default,
$http_timeout = $facts['os_service_default'],
$secret_cache_duration = 0,
$auth_url = 'http://127.0.0.1:5000',
$auth_type = 'password',
@ -94,7 +94,7 @@ class swift::proxy::s3token(
$password = undef,
$project_name = 'services',
$project_domain_id = 'default',
$system_scope = $::os_service_default,
$system_scope = $facts['os_service_default'],
) {
include swift::deps
@ -111,8 +111,8 @@ Please set password parameter')
$project_name_real = $project_name
$project_domain_id_real = $project_domain_id
} else {
$project_name_real = $::os_service_default
$project_domain_id_real = $::os_service_default
$project_name_real = $facts['os_service_default']
$project_domain_id_real = $facts['os_service_default']
}
swift_proxy_config {

40
manifests/proxy/slo.pp
View File

@ -9,49 +9,49 @@
#
# [*max_manifest_segments*]
# (Optional) Max manifest segments.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_manifest_size*]
# (Optional) Max manifest size.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*rate_limit_under_size*]
# (Optional) Rate limiting applies only to segments smaller than this size.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*rate_limit_after_segment*]
# (Optional) Start rate-limiting SLO segment serving after the Nth segment of
# a segmented object.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*rate_limit_segments_per_sec*]
# (Optional) Once segment rate-limiting kicks in for an object, limit segments
# served to N per second. 0 means no rate-limiting.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_get_time*]
# (Optional) Time limit on GET requests (seconds).
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*concurrency*]
# (Optional) Limit how many subrequests may be executed concurrently.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*delete_concurrency*]
# (Optional) Limit how many delete subrequests may be executed concurrently.
# This may be used to separately tune validation and delete concurrency
# values.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*yield_frequency*]
# (Optional) Frequency, in seconds, to yield whitespace ahead of the final
# response.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*allow_async_delete*]
# (Optional) Allow clients to request the object-expirer handle the deletion
# of segments using query params like `?multipart-manifest=delete&async=on`.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# == Authors
#
@ -62,16 +62,16 @@
# Copyright 2014 UnitedStack licensing@unitedstack.com
#
class swift::proxy::slo (
$max_manifest_segments = $::os_service_default,
$max_manifest_size = $::os_service_default,
$rate_limit_under_size = $::os_service_default,
$rate_limit_after_segment = $::os_service_default,
$rate_limit_segments_per_sec = $::os_service_default,
$max_get_time = $::os_service_default,
$concurrency = $::os_service_default,
$delete_concurrency = $::os_service_default,
$yield_frequency = $::os_service_default,
$allow_async_delete = $::os_service_default,
$max_manifest_segments = $facts['os_service_default'],
$max_manifest_size = $facts['os_service_default'],
$rate_limit_under_size = $facts['os_service_default'],
$rate_limit_after_segment = $facts['os_service_default'],
$rate_limit_segments_per_sec = $facts['os_service_default'],
$max_get_time = $facts['os_service_default'],
$concurrency = $facts['os_service_default'],
$delete_concurrency = $facts['os_service_default'],
$yield_frequency = $facts['os_service_default'],
$allow_async_delete = $facts['os_service_default'],
) {
include swift::deps

4
manifests/proxy/staticweb.pp
View File

@ -12,7 +12,7 @@
#
# [*url_base*]
# (optional) The URL scheme and/or the host name used to generate redirects.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# == Authors
#
@ -23,7 +23,7 @@
# Copyright 2012 eNovance licensing@enovance.com
#
class swift::proxy::staticweb(
$url_base = $::os_service_default
$url_base = $facts['os_service_default']
) {
include swift::deps

4
manifests/proxy/symlink.pp
View File

@ -23,14 +23,14 @@
# chain does not exceed the symloop_max value. If the number of chained
# symlinks exceeds the limit symloop_max a 409 (HTTPConflict) error
# response will be produced.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# == Authors
#
# shi.yan@ardc.edu.au
#
class swift::proxy::symlink(
$symloop_max = $::os_service_default,
$symloop_max = $facts['os_service_default'],
) {
include swift::deps

20
manifests/proxy/tempurl.pp
View File

@ -6,27 +6,27 @@
# [*methods*]
# Methods allowed with Temp URLs.
# Example: ['GET','HEAD','PUT','POST','DELETE'] or 'GET HEAD PUT POST DELETE'
# Optional. Defaults to $::os_service_default.
# Optional. Defaults to $facts['os_service_default'].
#
# [*incoming_remove_headers*]
# The headers to remove from incoming requests.
# Example: ['x-timestamp'] or 'x-timestamp'
# Optional. Defaults to $::os_service_default.
# Optional. Defaults to $facts['os_service_default'].
#
# [*incoming_allow_headers*]
# The headers allowed as exceptions to incoming_remove_headers
# Example: ['*'] or '*'
# Optional. Defaults to $::os_service_default.
# Optional. Defaults to $facts['os_service_default'].
#
# [*outgoing_remove_headers*]
# The headers to remove from outgoing responses
# Example: ['x-object-meta-*'] or 'x-object-meta-*'
# Optional. Defaults to $::os_service_default.
# Optional. Defaults to $facts['os_service_default'].
#
# [*outgoing_allow_headers*]
# The headers allowed as exceptions to outgoing_remove_headers
# Example: ['x-object-meta-public-*'] or 'x-object-meta-public-*'
# Optional. Defaults to $::os_service_default.
# Optional. Defaults to $facts['os_service_default'].
#
# == Examples
#
@ -45,11 +45,11 @@
# Copyright 2012 eNovance licensing@enovance.com
#
class swift::proxy::tempurl (
$methods = $::os_service_default,
$incoming_remove_headers = $::os_service_default,
$incoming_allow_headers = $::os_service_default,
$outgoing_remove_headers = $::os_service_default,
$outgoing_allow_headers = $::os_service_default,
$methods = $facts['os_service_default'],
$incoming_remove_headers = $facts['os_service_default'],
$incoming_allow_headers = $facts['os_service_default'],
$outgoing_remove_headers = $facts['os_service_default'],
$outgoing_allow_headers = $facts['os_service_default'],
) {
include swift::deps

40
manifests/storage/all.pp
View File

@ -74,33 +74,33 @@
#
# [*log_statsd_port*]
# (optional) statsd port to send data to.
# Default to $::os_service_default.
# Default to $facts['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.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*log_statsd_sample_rate_factor*]
# (optional) sample rate factor for data.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*log_statsd_metric_prefix*]
# (optional) Prefix for data being sent to statsd.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*account_server_workers*]
# (optional) Number of account server workers.
# Defaults to $::os_workers.
# Defaults to $facts['os_workers'].
#
# [*container_server_workers*]
# (optional) Number of container server workers.
# Defaults to $::os_workers.
# Defaults to $facts['os_workers'].
#
# [*object_server_workers*]
# (optional) Number of account server workers.
# Defaults to $::os_workers.
# Defaults to $facts['os_workers'].
#
# [*object_server_mb_per_sync*]
# (optional) Number of MB allocated for the cache.
@ -108,16 +108,16 @@
#
# [*rsync_timeout*]
# (optional) Max duration of a partition rsync.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*rsync_bwlimit*]
# (optional) Bandwidth limit for rsync in kB/s. 0 means unlimited.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*splice*]
# (optional) Use splice for zero-copy object GETs. This requires Linux Kernel
# version 3.0 or greater.
# Default to $::os_service_default.
# Default to $facts['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 = $::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 = $::os_service_default,
$rsync_timeout = $::os_service_default,
$rsync_bwlimit = $::os_service_default,
$log_statsd_port = $facts['os_service_default'],
$log_statsd_default_sample_rate = $facts['os_service_default'],
$log_statsd_sample_rate_factor = $facts['os_service_default'],
$log_statsd_metric_prefix = $facts['os_service_default'],
$account_server_workers = $facts['os_workers'],
$container_server_workers = $facts['os_workers'],
$object_server_workers = $facts['os_workers'],
$object_server_mb_per_sync = $facts['os_service_default'],
$rsync_timeout = $facts['os_service_default'],
$rsync_bwlimit = $facts['os_service_default'],
$splice = false,
$max_connections = 25,
$rsync_use_xinetd = $::swift::params::xinetd_available,

38
manifests/storage/drive_audit.pp
View File

@ -55,41 +55,41 @@
#
# [*device_dir*]
# (Optional) Directory devices are mounted under
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*minutes*]
# (Optional) Number of minutes to look back in the log file.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*error_limit*]
# (Optional) Number of errors to find before a device is unmounted
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*recon_cache_path*]
# (Optional) The path for recon cache
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*log_file_pattern*]
# (Optional) Location of the log file with globbing pattern to check against
# device errors.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*log_file_encoding*]
# (Optional) The encoding used to interpret the log files.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*log_to_console*]
# (Optional) Make drive-audit log to console in addition to syslog
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*unmount_failed_device*]
# (Optional) Unmount the device with errors detected.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*regex_pattern*]
# (Optional) Regular expression patterns to be used to locate device blocks
# with errors in the log file.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*purge_config*]
# (Optional) Whether to set only the specified config options in the drive
@ -113,13 +113,13 @@ class swift::storage::drive_audit(
$log_udp_host = undef,
$log_udp_port = undef,
$device_dir = '/srv/node',
$minutes = $::os_service_default,
$error_limit = $::os_service_default,
$recon_cache_path = $::os_service_default,
$log_file_pattern = $::os_service_default,
$log_file_encoding = $::os_service_default,
$log_to_console = $::os_service_default,
$unmount_failed_device = $::os_service_default,
$minutes = $facts['os_service_default'],
$error_limit = $facts['os_service_default'],
$recon_cache_path = $facts['os_service_default'],
$log_file_pattern = $facts['os_service_default'],
$log_file_encoding = $facts['os_service_default'],
$log_to_console = $facts['os_service_default'],
$unmount_failed_device = $facts['os_service_default'],
$regex_pattern = {},
$purge_config = false,
) inherits swift::params {
@ -142,12 +142,12 @@ class swift::storage::drive_audit(
if $log_udp_host {
swift_drive_audit_config {
'drive-audit/log_udp_host': value => $log_udp_host;
'drive-audit/log_udp_port': value => pick($log_udp_port, $::os_service_default);
'drive-audit/log_udp_port': value => pick($log_udp_port, $facts['os_service_default']);
}
} else {
swift_drive_audit_config {
'drive-audit/log_udp_host': value => $::os_service_default;
'drive-audit/log_udp_port': value => $::os_service_default;
'drive-audit/log_udp_host': value => $facts['os_service_default'];
'drive-audit/log_udp_port': value => $facts['os_service_default'];
}
}

8
manifests/storage/filter/backend_ratelimit.pp
View File

@ -6,12 +6,12 @@
# [*requests_per_device_per_second*]
# (optional) Set the maximum rate of requests per second per device per
# worker.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*requests_per_device_rate_buffer*]
# (optional) Set the number of seconds of unused rate-limiting allowance that
# can accumulate and be used to allow a subsequent burst of requests.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# == Dependencies
#
@ -26,8 +26,8 @@
# Copyright 2022 Red Hat, unless otherwise noted.
#
define swift::storage::filter::backend_ratelimit(
$requests_per_device_per_second = $::os_service_default,
$requests_per_device_rate_buffer = $::os_service_default,
$requests_per_device_per_second = $facts['os_service_default'],
$requests_per_device_rate_buffer = $facts['os_service_default'],
) {
include swift::deps

4
manifests/storage/filter/recon.pp
View File

@ -4,7 +4,7 @@
# == Parameters
# [*cache_path*]
# (Optional) The path for recon cache
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# == Dependencies
#
@ -20,7 +20,7 @@
# Copyright 2011 Puppetlabs Inc, unless otherwise noted.
#
define swift::storage::filter::recon(
$cache_path = $::os_service_default,
$cache_path = $facts['os_service_default'],
) {
include swift::deps

2
manifests/storage/mount.pp
View File

@ -93,7 +93,7 @@ define swift::storage::mount(
# would be possible as context is. But, as there already is
# chown command we'll just restorecon on selinux enabled
# systems :(
if (str2bool($::selinux) == true) {
if (str2bool($facts['os']['selinux']['enabled']) == true) {
exec { "restorecon_mount_${name}":
command => "restorecon ${mnt_base_dir}/${name}",
path => ['/usr/sbin', '/sbin'],

102
manifests/storage/server.pp
View File

@ -58,17 +58,17 @@
#
# [*disable_fallocate*]
# (optional) Disable pre-allocating the required disk space.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*fallocate_reserve*]
# (optional) The number of bytes or percentage of disk space kept free at
# all times.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*server_fallocate_reserve*]
# (optional) The number of bytes or percentage of disk space kept free at
# all times. This option affects only <type>-server processes.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*servers_per_port*]
# (optional) Spawn multiple servers per device on different ports.
@ -76,7 +76,7 @@
# "local" ring devices across all storage policies. This can help provide
# the isolation of threads_per_disk without the severe overhead. The default
# value of 0 disables this feature.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*user*]
# (optional) User to run as
@ -89,7 +89,7 @@
# one. Increasing the number of workers may reduce the possibility of slow file
# system operations in one request from negatively impacting other requests.
# See https://docs.openstack.org/swift/latest/deployment_guide.html#general-service-tuning
# Defaults to $::os_workers.
# Defaults to $facts['os_workers'].
#
# [*replicator_concurrency*]
# (optional) Number of replicator workers to spawn.
@ -97,7 +97,7 @@
#
# [*replicator_interval*]
# (optional) Minimum time for a pass to take, in seconds.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*updater_concurrency*]
# (optional) Number of updater workers to spawn.
@ -151,69 +151,69 @@
#
# [*log_statsd_port*]
# (optional) statsd port to send data to.
# Defaults to $::os_service_default.
# Defaults to $facts['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 $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*log_statsd_sample_rate_factor*]
# (optional) sample rate factor for data.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*log_statsd_metric_prefix*]
# (optional) Prefix for data being sent to statsd.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*network_chunk_size*]
# (optional) Size of chunks to read/write over the network.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*disk_chunk_size*]
# (optional) Size of chunks to read/write to disk.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*auditor_disk_chunk_size*]
# (optional) Object-auditor size of chunks to read/write to disk.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*client_timeout*]
# (optional) Object-server timeout in seconds to read one chunk from a client
# external services.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*rsync_timeout*]
# (optional) Max duration of a partition rsync.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*rsync_bwlimit*]
# (optional) Bandwidth limit for rsync in kB/s. 0 means unlimited.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*splice*]
# (optional) Use splice for zero-copy object GETs. This requires Linux Kernel
# version 3.0 or greater.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*object_server_mb_per_sync*]
# (optional) Number of MB allocated for the cache.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*container_sharder_auto_shard*]
# (optional) If the auto_shard option is true then the sharder will
# automatically select containers to shard, scan for shard ranges,
# and select shards to shrink.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*container_sharder_concurrency*]
# (optional) Number of replication workers to spawn.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
# [*container_sharder_interval*]
# (optional) Time in seconds to wait between sharder cycles.
# Default to $::os_service_default.
# Default to $facts['os_service_default'].
#
define swift::storage::server(
$type,
@ -228,14 +228,14 @@ define swift::storage::server(
$max_connections = 25,
$pipeline = ["${type}-server"],
$mount_check = true,
$disable_fallocate = $::os_service_default,
$fallocate_reserve = $::os_service_default,
$server_fallocate_reserve = $::os_service_default,
$servers_per_port = $::os_service_default,
$disable_fallocate = $facts['os_service_default'],
$fallocate_reserve = $facts['os_service_default'],
$server_fallocate_reserve = $facts['os_service_default'],
$servers_per_port = $facts['os_service_default'],
$user = undef,
$workers = $::os_workers,
$workers = $facts['os_workers'],
$replicator_concurrency = 1,
$replicator_interval = $::os_service_default,
$replicator_interval = $facts['os_service_default'],
$updater_concurrency = 1,
$reaper_concurrency = 1,
$log_facility = 'LOG_LOCAL2',
@ -249,23 +249,23 @@ define swift::storage::server(
$config_file_path = "${type}-server.conf",
$statsd_enabled = false,
$log_statsd_host = 'localhost',
$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,
$network_chunk_size = $::os_service_default,
$disk_chunk_size = $::os_service_default,
$client_timeout = $::os_service_default,
$auditor_disk_chunk_size = $::os_service_default,
$rsync_timeout = $::os_service_default,
$rsync_bwlimit = $::os_service_default,
$splice = $::os_service_default,
$object_server_mb_per_sync = $::os_service_default,
$log_statsd_port = $facts['os_service_default'],
$log_statsd_default_sample_rate = $facts['os_service_default'],
$log_statsd_sample_rate_factor = $facts['os_service_default'],
$log_statsd_metric_prefix = $facts['os_service_default'],
$network_chunk_size = $facts['os_service_default'],
$disk_chunk_size = $facts['os_service_default'],
$client_timeout = $facts['os_service_default'],
$auditor_disk_chunk_size = $facts['os_service_default'],
$rsync_timeout = $facts['os_service_default'],
$rsync_bwlimit = $facts['os_service_default'],
$splice = $facts['os_service_default'],
$object_server_mb_per_sync = $facts['os_service_default'],
# These parameters only apply to container-server.conf,
# and define options for the container-sharder service.
$container_sharder_auto_shard = $::os_service_default,
$container_sharder_concurrency = $::os_service_default,
$container_sharder_interval = $::os_service_default,
$container_sharder_auto_shard = $facts['os_service_default'],
$container_sharder_concurrency = $facts['os_service_default'],
$container_sharder_interval = $facts['os_service_default'],
){
include swift::deps
@ -329,7 +329,7 @@ define swift::storage::server(
max_connections => $max_connections,
read_only => false,
}
$rsync_module = $::os_service_default
$rsync_module = $facts['os_service_default']
}
$config_file_full_path = "/etc/swift/${config_file_path}"
@ -402,12 +402,12 @@ define swift::storage::server(
if $log_udp_host {
$log_udp_opts = {
'DEFAULT/log_udp_host' => {'value' => $log_udp_host},
'DEFAULT/log_udp_port' => {'value' => pick($log_udp_port, $::os_service_default)},
'DEFAULT/log_udp_port' => {'value' => pick($log_udp_port, $facts['os_service_default'])},
}
} else {
$log_udp_opts = {
'DEFAULT/log_udp_host' => {'value' => $::os_service_default},
'DEFAULT/log_udp_port' => {'value' => $::os_service_default},
'DEFAULT/log_udp_host' => {'value' => $facts['os_service_default']},
'DEFAULT/log_udp_port' => {'value' => $facts['os_service_default']},
}
}
@ -422,11 +422,11 @@ define swift::storage::server(
}
} else {
$log_statsd_opts = {
'DEFAULT/log_statsd_host' => {'value' => $::os_service_default},
'DEFAULT/log_statsd_port' => {'value' => $::os_service_default},
'DEFAULT/log_statsd_default_sample_rate' => {'value' => $::os_service_default},
'DEFAULT/log_statsd_sample_rate_factor' => {'value' => $::os_service_default},
'DEFAULT/log_statsd_metric_prefix' => {'value' => $::os_service_default},
'DEFAULT/log_statsd_host' => {'value' => $facts['os_service_default']},
'DEFAULT/log_statsd_port' => {'value' => $facts['os_service_default']},
'DEFAULT/log_statsd_default_sample_rate' => {'value' => $facts['os_service_default']},
'DEFAULT/log_statsd_sample_rate_factor' => {'value' => $facts['os_service_default']},
'DEFAULT/log_statsd_metric_prefix' => {'value' => $facts['os_service_default']},
}
}

6
manifests/wsgi/uwsgi_account.pp
View File

@ -11,20 +11,20 @@
#
# [*processes*]
# (Optional) Number of processes.
# Defaults to $::os_workers.
# Defaults to $facts['os_workers'].
#
# [*listen_queue_size*]
# (Optional) Socket listen queue size.
# Defaults to 100
#
class swift::wsgi::uwsgi_account (
$processes = $::os_workers,
$processes = $facts['os_workers'],
$listen_queue_size = 100,
){
include swift::deps
if $::operatingsystem != 'Debian'{
if $facts['os']['name'] != 'Debian'{
warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.')
}

6
manifests/wsgi/uwsgi_container.pp
View File

@ -11,20 +11,20 @@
#
# [*processes*]
# (Optional) Number of processes.
# Defaults to $::os_workers.
# Defaults to $facts['os_workers'].
#
# [*listen_queue_size*]
# (Optional) Socket listen queue size.
# Defaults to 100
#
class swift::wsgi::uwsgi_container (
$processes = $::os_workers,
$processes = $facts['os_workers'],
$listen_queue_size = 100,
){
include swift::deps
if $::operatingsystem != 'Debian'{
if $facts['os']['name'] != 'Debian'{
warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.')
}

6
manifests/wsgi/uwsgi_proxy.pp
View File

@ -11,20 +11,20 @@
#
# [*processes*]
# (Optional) Number of processes.
# Defaults to $::os_workers.
# Defaults to $facts['os_workers'].
#
# [*listen_queue_size*]
# (Optional) Socket listen queue size.
# Defaults to 100
#
class swift::wsgi::uwsgi_proxy (
$processes = $::os_workers,
$processes = $facts['os_workers'],
$listen_queue_size = 100,
){
include swift::deps
if $::operatingsystem != 'Debian'{
if $facts['os']['name'] != 'Debian'{
warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.')
}

6
spec/classes/swift_client_spec.rb
View File

@ -33,13 +33,11 @@ describe 'swift::client' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge(OSDefaults.get_facts({
:fqdn => 'some.host.tld',
}))
facts.merge(OSDefaults.get_facts())
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :client_package_name => 'python3-swiftclient' }
when 'RedHat'

2
spec/classes/swift_containerreconciler_spec.rb
View File

@ -93,7 +93,7 @@ describe 'swift::containerreconciler' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :service_name => 'swift-container-reconciler',
:service_provider => nil }

2
spec/classes/swift_dispersion_spec.rb
View File

@ -93,7 +93,7 @@ describe 'swift::dispersion' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge(OSDefaults.get_facts({ :puppetversion => '4.8.0' }))
facts.merge(OSDefaults.get_facts())
end
it_configures 'swift::dispersion'

2
spec/classes/swift_objectexpirer_spec.rb
View File

@ -117,7 +117,7 @@ describe 'swift::objectexpirer' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :service_name => 'swift-object-expirer',
:service_provider => nil }

2
spec/classes/swift_proxy_ceilometer_spec.rb
View File

@ -138,7 +138,7 @@ describe 'swift::proxy::ceilometer' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :ceilometermiddleware_package_name => 'python3-ceilometermiddleware' }
when 'RedHat'

2
spec/classes/swift_proxy_cname_lookup_spec.rb
View File

@ -52,7 +52,7 @@ describe 'swift::proxy::cname_lookup' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :dnspython_package_name => 'python3-dnspython' }
when 'RedHat'

2
spec/classes/swift_proxy_spec.rb
View File

@ -352,7 +352,7 @@ describe 'swift::proxy' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ 'swift-proxy-server' => 'swift-proxy' }
when 'RedHat'

2
spec/classes/swift_ringserver_spec.rb
View File

@ -70,7 +70,7 @@ describe 'swift::ringserver' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :xinetd_available => true }
when 'RedHat'

2
spec/classes/swift_storage_account_spec.rb
View File

@ -82,7 +82,7 @@ describe 'swift::storage::account' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :service_names => {
'swift-account-server' => 'swift-account',

4
spec/classes/swift_storage_all_spec.rb
View File

@ -173,7 +173,7 @@ describe 'swift::storage::all' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :xinetd_available => true }
when 'RedHat'
@ -183,7 +183,7 @@ describe 'swift::storage::all' do
it_configures 'swift::storage::all'
if facts[:osfamily] == 'Debian'
if facts[:os]['family'] == 'Debian'
it_configures 'swift::storage::all debian'
end
end

2
spec/classes/swift_storage_container_spec.rb
View File

@ -83,7 +83,7 @@ describe 'swift::storage::container' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :service_names => {
'swift-container-server' => 'swift-container',

2
spec/classes/swift_storage_object_spec.rb
View File

@ -83,7 +83,7 @@ describe 'swift::storage::object' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :service_names => {
'swift-object-server' => 'swift-object',

2
spec/classes/swift_storage_spec.rb
View File

@ -58,7 +58,7 @@ describe 'swift::storage' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :xinetd_available => true }
when 'RedHat'

2
spec/defines/swift_storage_generic_spec.rb
View File

@ -122,7 +122,7 @@ describe 'swift::storage::generic' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
'swift-account-server' => 'swift-account',

4
spec/defines/swift_storage_mount_spec.rb
View File

@ -43,9 +43,7 @@ describe 'swift::storage::mount' do
end
before do
facts.merge!({
:selinux => 'true',
})
facts[:os]['selinux']['enabled'] = 'true'
end
it { is_expected.to contain_exec("restorecon_mount_dans_mount_point").with(