Validate ensure parameter for package resources

The minimum version of puppetlabs-stdlib has been bumped globally, so
now we can use the common type definition.

Change-Id: I0f468404790f6b084e48110dc19a3ec6f0dd6163
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-23 17:32:53 +09:00
parent cb7705ac59
commit c7e97b66b7
4 changed files with 75 additions and 75 deletions

View File

@@ -254,47 +254,47 @@
# Defaults to 'present'
#
define oslo::cache (
$config_prefix = $facts['os_service_default'],
$expiration_time = $facts['os_service_default'],
$backend_expiration_time = $facts['os_service_default'],
$backend = $facts['os_service_default'],
$backend_argument = $facts['os_service_default'],
$proxies = $facts['os_service_default'],
$enabled = $facts['os_service_default'],
$debug_cache_backend = $facts['os_service_default'],
$memcache_servers = $facts['os_service_default'],
$memcache_dead_retry = $facts['os_service_default'],
$memcache_socket_timeout = $facts['os_service_default'],
$enable_socket_keepalive = $facts['os_service_default'],
$socket_keepalive_idle = $facts['os_service_default'],
$socket_keepalive_interval = $facts['os_service_default'],
$socket_keepalive_count = $facts['os_service_default'],
$memcache_pool_maxsize = $facts['os_service_default'],
$memcache_pool_unused_timeout = $facts['os_service_default'],
$memcache_pool_connection_get_timeout = $facts['os_service_default'],
$memcache_pool_flush_on_reconnect = $facts['os_service_default'],
$memcache_sasl_enabled = $facts['os_service_default'],
$memcache_username = $facts['os_service_default'],
$memcache_password = $facts['os_service_default'],
$redis_server = $facts['os_service_default'],
$redis_username = $facts['os_service_default'],
$redis_password = $facts['os_service_default'],
$redis_sentinels = $facts['os_service_default'],
$redis_socket_timeout = $facts['os_service_default'],
$redis_sentinel_service_name = $facts['os_service_default'],
$tls_enabled = $facts['os_service_default'],
$tls_cafile = $facts['os_service_default'],
$tls_certfile = $facts['os_service_default'],
$tls_keyfile = $facts['os_service_default'],
$tls_allowed_ciphers = $facts['os_service_default'],
$enable_retry_client = $facts['os_service_default'],
$retry_attempts = $facts['os_service_default'],
$retry_delay = $facts['os_service_default'],
$hashclient_retry_attempts = $facts['os_service_default'],
$hashclient_retry_delay = $facts['os_service_default'],
$dead_timeout = $facts['os_service_default'],
Boolean $manage_backend_package = true,
$package_ensure = 'present',
$config_prefix = $facts['os_service_default'],
$expiration_time = $facts['os_service_default'],
$backend_expiration_time = $facts['os_service_default'],
$backend = $facts['os_service_default'],
$backend_argument = $facts['os_service_default'],
$proxies = $facts['os_service_default'],
$enabled = $facts['os_service_default'],
$debug_cache_backend = $facts['os_service_default'],
$memcache_servers = $facts['os_service_default'],
$memcache_dead_retry = $facts['os_service_default'],
$memcache_socket_timeout = $facts['os_service_default'],
$enable_socket_keepalive = $facts['os_service_default'],
$socket_keepalive_idle = $facts['os_service_default'],
$socket_keepalive_interval = $facts['os_service_default'],
$socket_keepalive_count = $facts['os_service_default'],
$memcache_pool_maxsize = $facts['os_service_default'],
$memcache_pool_unused_timeout = $facts['os_service_default'],
$memcache_pool_connection_get_timeout = $facts['os_service_default'],
$memcache_pool_flush_on_reconnect = $facts['os_service_default'],
$memcache_sasl_enabled = $facts['os_service_default'],
$memcache_username = $facts['os_service_default'],
$memcache_password = $facts['os_service_default'],
$redis_server = $facts['os_service_default'],
$redis_username = $facts['os_service_default'],
$redis_password = $facts['os_service_default'],
$redis_sentinels = $facts['os_service_default'],
$redis_socket_timeout = $facts['os_service_default'],
$redis_sentinel_service_name = $facts['os_service_default'],
$tls_enabled = $facts['os_service_default'],
$tls_cafile = $facts['os_service_default'],
$tls_certfile = $facts['os_service_default'],
$tls_keyfile = $facts['os_service_default'],
$tls_allowed_ciphers = $facts['os_service_default'],
$enable_retry_client = $facts['os_service_default'],
$retry_attempts = $facts['os_service_default'],
$retry_delay = $facts['os_service_default'],
$hashclient_retry_attempts = $facts['os_service_default'],
$hashclient_retry_delay = $facts['os_service_default'],
$dead_timeout = $facts['os_service_default'],
Boolean $manage_backend_package = true,
Stdlib::Ensure::Package $package_ensure = present,
) {
include oslo::params

View File

@@ -21,10 +21,10 @@
# Defaults to true.
#
define oslo::coordination (
$backend_url = $facts['os_service_default'],
Boolean $manage_backend_package = true,
$package_ensure = 'present',
Boolean $manage_config = true,
$backend_url = $facts['os_service_default'],
Boolean $manage_backend_package = true,
Stdlib::Ensure::Package $package_ensure = present,
Boolean $manage_config = true,
) {
include oslo::params

View File

@@ -112,30 +112,30 @@
# Defaults to true.
#
define oslo::db (
$config = $name,
String[1] $config_group = 'database',
$sqlite_synchronous = $facts['os_service_default'],
$backend = $facts['os_service_default'],
Boolean $manage_backend_package = true,
$backend_package_ensure = present,
Oslo::Dbconn $connection = $facts['os_service_default'],
Oslo::Dbconn $slave_connection = $facts['os_service_default'],
$mysql_sql_mode = $facts['os_service_default'],
$connection_recycle_time = $facts['os_service_default'],
$max_pool_size = $facts['os_service_default'],
$max_retries = $facts['os_service_default'],
$retry_interval = $facts['os_service_default'],
$max_overflow = $facts['os_service_default'],
$connection_debug = $facts['os_service_default'],
$connection_trace = $facts['os_service_default'],
$pool_timeout = $facts['os_service_default'],
$use_db_reconnect = $facts['os_service_default'],
$db_retry_interval = $facts['os_service_default'],
$db_inc_retry_interval = $facts['os_service_default'],
$db_max_retry_interval = $facts['os_service_default'],
$db_max_retries = $facts['os_service_default'],
$mysql_enable_ndb = $facts['os_service_default'],
Boolean $manage_config = true,
$config = $name,
String[1] $config_group = 'database',
$sqlite_synchronous = $facts['os_service_default'],
$backend = $facts['os_service_default'],
Boolean $manage_backend_package = true,
Stdlib::Ensure::Package $backend_package_ensure = present,
Oslo::Dbconn $connection = $facts['os_service_default'],
Oslo::Dbconn $slave_connection = $facts['os_service_default'],
$mysql_sql_mode = $facts['os_service_default'],
$connection_recycle_time = $facts['os_service_default'],
$max_pool_size = $facts['os_service_default'],
$max_retries = $facts['os_service_default'],
$retry_interval = $facts['os_service_default'],
$max_overflow = $facts['os_service_default'],
$connection_debug = $facts['os_service_default'],
$connection_trace = $facts['os_service_default'],
$pool_timeout = $facts['os_service_default'],
$use_db_reconnect = $facts['os_service_default'],
$db_retry_interval = $facts['os_service_default'],
$db_inc_retry_interval = $facts['os_service_default'],
$db_max_retry_interval = $facts['os_service_default'],
$db_max_retries = $facts['os_service_default'],
$mysql_enable_ndb = $facts['os_service_default'],
Boolean $manage_config = true,
) {
include oslo::params

View File

@@ -30,12 +30,12 @@
# Defaults to false
#
define oslo::reports (
$config = $name,
$log_dir = $facts['os_service_default'],
$file_event_handler = $facts['os_service_default'],
$file_event_handler_interval = $facts['os_service_default'],
$package_ensure = 'present',
Boolean $manage_package = false,
$config = $name,
$log_dir = $facts['os_service_default'],
$file_event_handler = $facts['os_service_default'],
$file_event_handler_interval = $facts['os_service_default'],
Stdlib::Ensure::Package $package_ensure = present,
Boolean $manage_package = false,
) {
include oslo::params