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: I4255da364e203c0898c9bb897cfaf753835069a1
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-23 18:00:03 +09:00
parent 9457bf099f
commit 525e6e0e15
6 changed files with 70 additions and 70 deletions

View File

@@ -72,18 +72,18 @@
# Defaults to 'keystone'
#
class watcher::api (
$package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
$port = $facts['os_service_default'],
$max_limit = $facts['os_service_default'],
$bind_host = $facts['os_service_default'],
$workers = $facts['os_workers'],
$enable_ssl_api = $facts['os_service_default'],
$service_name = $watcher::params::api_service_name,
Boolean $create_db_schema = false,
Boolean $upgrade_db = false,
$auth_strategy = 'keystone',
Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
$port = $facts['os_service_default'],
$max_limit = $facts['os_service_default'],
$bind_host = $facts['os_service_default'],
$workers = $facts['os_workers'],
$enable_ssl_api = $facts['os_service_default'],
$service_name = $watcher::params::api_service_name,
Boolean $create_db_schema = false,
Boolean $upgrade_db = false,
$auth_strategy = 'keystone',
) inherits watcher::params {
include watcher::deps
include watcher::policy

View File

@@ -37,14 +37,14 @@
# Defaults to $facts['os_service_default']
#
class watcher::applier (
$package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
$applier_workers = $facts['os_service_default'],
$applier_conductor_topic = $facts['os_service_default'],
$applier_status_topic = $facts['os_service_default'],
$applier_publisher_id = $facts['os_service_default'],
$applier_workflow_engine = $facts['os_service_default'],
Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
$applier_workers = $facts['os_service_default'],
$applier_conductor_topic = $facts['os_service_default'],
$applier_status_topic = $facts['os_service_default'],
$applier_publisher_id = $facts['os_service_default'],
$applier_workflow_engine = $facts['os_service_default'],
) {
include watcher::params
include watcher::deps

View File

@@ -9,7 +9,7 @@
# Defaults to 'present'.
#
class watcher::client (
$ensure = 'present'
Stdlib::Ensure::Package $ensure = 'present',
) {
include watcher::deps
include watcher::params

View File

@@ -63,19 +63,19 @@
# Defaults to $facts['os_service_default']
#
class watcher::decision_engine (
$package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
$max_audit_workers = $facts['os_service_default'],
$max_general_workers = $facts['os_service_default'],
$decision_engine_conductor_topic = $facts['os_service_default'],
$decision_engine_status_topic = $facts['os_service_default'],
$decision_engine_notification_topics = $facts['os_service_default'],
$decision_engine_publisher_id = $facts['os_service_default'],
$planner = $facts['os_service_default'],
$weights = $facts['os_service_default'],
Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
$max_audit_workers = $facts['os_service_default'],
$max_general_workers = $facts['os_service_default'],
$decision_engine_conductor_topic = $facts['os_service_default'],
$decision_engine_status_topic = $facts['os_service_default'],
$decision_engine_notification_topics = $facts['os_service_default'],
$decision_engine_publisher_id = $facts['os_service_default'],
$planner = $facts['os_service_default'],
$weights = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$decision_engine_workers = undef,
$decision_engine_workers = undef,
) {
include watcher::params
include watcher::deps

View File

@@ -183,42 +183,42 @@
# Daniel Pawlik <daniel.pawlik@corp.ovh.com>
#
class watcher (
$package_ensure = 'present',
$host = $facts['os_service_default'],
$rabbit_login_method = $facts['os_service_default'],
$rabbit_retry_interval = $facts['os_service_default'],
$rabbit_retry_backoff = $facts['os_service_default'],
$rabbit_interval_max = $facts['os_service_default'],
$rabbit_use_ssl = $facts['os_service_default'],
$rabbit_heartbeat_rate = $facts['os_service_default'],
$rabbit_ha_queues = $facts['os_service_default'],
$rabbit_quorum_queue = $facts['os_service_default'],
$rabbit_transient_quorum_queue = $facts['os_service_default'],
$rabbit_quorum_delivery_limit = $facts['os_service_default'],
$rabbit_quorum_max_memory_length = $facts['os_service_default'],
$rabbit_quorum_max_memory_bytes = $facts['os_service_default'],
$rabbit_use_queue_manager = $facts['os_service_default'],
$rabbit_stream_fanout = $facts['os_service_default'],
$rabbit_enable_cancel_on_failover = $facts['os_service_default'],
$rabbit_transient_queues_ttl = $facts['os_service_default'],
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
$kombu_ssl_ca_certs = $facts['os_service_default'],
$kombu_ssl_certfile = $facts['os_service_default'],
$kombu_ssl_keyfile = $facts['os_service_default'],
$kombu_ssl_version = $facts['os_service_default'],
$kombu_reconnect_delay = $facts['os_service_default'],
$kombu_missing_consumer_retry_timeout = $facts['os_service_default'],
$kombu_failover_strategy = $facts['os_service_default'],
$kombu_compression = $facts['os_service_default'],
$amqp_durable_queues = $facts['os_service_default'],
$default_transport_url = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'],
$control_exchange = $facts['os_service_default'],
$notification_transport_url = $facts['os_service_default'],
$notification_driver = $facts['os_service_default'],
$notification_topics = $facts['os_service_default'],
$notification_retry = $facts['os_service_default'],
Boolean $purge_config = false,
Stdlib::Ensure::Package $package_ensure = 'present',
$host = $facts['os_service_default'],
$rabbit_login_method = $facts['os_service_default'],
$rabbit_retry_interval = $facts['os_service_default'],
$rabbit_retry_backoff = $facts['os_service_default'],
$rabbit_interval_max = $facts['os_service_default'],
$rabbit_use_ssl = $facts['os_service_default'],
$rabbit_heartbeat_rate = $facts['os_service_default'],
$rabbit_ha_queues = $facts['os_service_default'],
$rabbit_quorum_queue = $facts['os_service_default'],
$rabbit_transient_quorum_queue = $facts['os_service_default'],
$rabbit_quorum_delivery_limit = $facts['os_service_default'],
$rabbit_quorum_max_memory_length = $facts['os_service_default'],
$rabbit_quorum_max_memory_bytes = $facts['os_service_default'],
$rabbit_use_queue_manager = $facts['os_service_default'],
$rabbit_stream_fanout = $facts['os_service_default'],
$rabbit_enable_cancel_on_failover = $facts['os_service_default'],
$rabbit_transient_queues_ttl = $facts['os_service_default'],
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
$kombu_ssl_ca_certs = $facts['os_service_default'],
$kombu_ssl_certfile = $facts['os_service_default'],
$kombu_ssl_keyfile = $facts['os_service_default'],
$kombu_ssl_version = $facts['os_service_default'],
$kombu_reconnect_delay = $facts['os_service_default'],
$kombu_missing_consumer_retry_timeout = $facts['os_service_default'],
$kombu_failover_strategy = $facts['os_service_default'],
$kombu_compression = $facts['os_service_default'],
$amqp_durable_queues = $facts['os_service_default'],
$default_transport_url = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'],
$control_exchange = $facts['os_service_default'],
$notification_transport_url = $facts['os_service_default'],
$notification_driver = $facts['os_service_default'],
$notification_topics = $facts['os_service_default'],
$notification_retry = $facts['os_service_default'],
Boolean $purge_config = false,
) {
include watcher::deps
include watcher::params

View File

@@ -7,7 +7,7 @@
},
{
"name": "puppetlabs/stdlib",
"version_requirement": ">=5.0.0 <10.0.0"
"version_requirement": ">=9.0.0 <10.0.0"
},
{
"name": "openstack/keystone",