From b4875a3421e1207f329bdd9276a297ec86ab3da3 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 23 Sep 2025 18:06:54 +0900 Subject: [PATCH] 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: Ib4b9ba1979eea0f9dc4d1290f86e5b483316cdf4 Signed-off-by: Takashi Kajinami --- manifests/api.pp | 22 ++++++------ manifests/client.pp | 2 +- manifests/engine.pp | 22 ++++++------ manifests/event_engine.pp | 12 +++---- manifests/executor.pp | 14 ++++---- manifests/init.pp | 74 +++++++++++++++++++-------------------- manifests/notifier.pp | 14 ++++---- metadata.json | 2 +- 8 files changed, 81 insertions(+), 81 deletions(-) diff --git a/manifests/api.pp b/manifests/api.pp index 3402d69..7135e81 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -59,17 +59,17 @@ # Defaults to 'keystone' # class mistral::api ( - $allow_action_execution_deletion = $facts['os_service_default'], - $api_workers = $facts['os_workers'], - $bind_host = $facts['os_service_default'], - $bind_port = $facts['os_service_default'], - Boolean $enabled = true, - Boolean $manage_service = true, - $package_ensure = present, - $service_name = $mistral::params::api_service_name, - $enable_proxy_headers_parsing = $facts['os_service_default'], - $max_request_body_size = $facts['os_service_default'], - $auth_strategy = 'keystone', + $allow_action_execution_deletion = $facts['os_service_default'], + $api_workers = $facts['os_workers'], + $bind_host = $facts['os_service_default'], + $bind_port = $facts['os_service_default'], + Boolean $enabled = true, + Boolean $manage_service = true, + Stdlib::Ensure::Package $package_ensure = present, + $service_name = $mistral::params::api_service_name, + $enable_proxy_headers_parsing = $facts['os_service_default'], + $max_request_body_size = $facts['os_service_default'], + $auth_strategy = 'keystone', ) inherits mistral::params { include mistral::deps include mistral::params diff --git a/manifests/client.pp b/manifests/client.pp index c315053..af200e6 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -8,7 +8,7 @@ # Ensure state for package. Defaults to 'present'. # class mistral::client ( - $package_ensure = 'present' + Stdlib::Ensure::Package $package_ensure = present, ) { include mistral::deps include mistral::params diff --git a/manifests/engine.pp b/manifests/engine.pp index 59a92ad..82cf659 100644 --- a/manifests/engine.pp +++ b/manifests/engine.pp @@ -53,17 +53,17 @@ # Defaults to $facts['os_service_default']. # class mistral::engine ( - $package_ensure = present, - Boolean $manage_service = true, - Boolean $enabled = true, - $host = $facts['os_service_default'], - $topic = $facts['os_service_default'], - $version = $facts['os_service_default'], - $execution_field_size_limit_kb = $facts['os_service_default'], - $execution_integrity_check_delay = $facts['os_service_default'], - $execution_integrity_check_batch_size = $facts['os_service_default'], - $action_definition_cache_time = $facts['os_service_default'], - $start_subworkflows_via_rpc = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = present, + Boolean $manage_service = true, + Boolean $enabled = true, + $host = $facts['os_service_default'], + $topic = $facts['os_service_default'], + $version = $facts['os_service_default'], + $execution_field_size_limit_kb = $facts['os_service_default'], + $execution_integrity_check_delay = $facts['os_service_default'], + $execution_integrity_check_batch_size = $facts['os_service_default'], + $action_definition_cache_time = $facts['os_service_default'], + $start_subworkflows_via_rpc = $facts['os_service_default'], ) { include mistral::deps include mistral::params diff --git a/manifests/event_engine.pp b/manifests/event_engine.pp index 0544d2c..41b24be 100644 --- a/manifests/event_engine.pp +++ b/manifests/event_engine.pp @@ -29,12 +29,12 @@ # Defaults to $facts['os_service_default']. # class mistral::event_engine ( - $package_ensure = present, - Boolean $manage_service = true, - Boolean $enabled = true, - $host = $facts['os_service_default'], - $topic = $facts['os_service_default'], - $event_definitions_cfg_file = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = present, + Boolean $manage_service = true, + Boolean $enabled = true, + $host = $facts['os_service_default'], + $topic = $facts['os_service_default'], + $event_definitions_cfg_file = $facts['os_service_default'], ) { include mistral::deps include mistral::params diff --git a/manifests/executor.pp b/manifests/executor.pp index 77435d8..638762d 100644 --- a/manifests/executor.pp +++ b/manifests/executor.pp @@ -36,13 +36,13 @@ # Defaults to $facts['os_service_default']. # class mistral::executor ( - $package_ensure = present, - Boolean $manage_service = true, - Boolean $enabled = true, - Enum['local', 'remote'] $type = 'remote', - $host = $facts['os_service_default'], - $topic = $facts['os_service_default'], - $version = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = present, + Boolean $manage_service = true, + Boolean $enabled = true, + Enum['local', 'remote'] $type = 'remote', + $host = $facts['os_service_default'], + $topic = $facts['os_service_default'], + $version = $facts['os_service_default'], ) { include mistral::deps include mistral::params diff --git a/manifests/init.pp b/manifests/init.pp index 600578a..ef74ca9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -194,43 +194,43 @@ # Defaults to $facts['os_service_default'] # class mistral ( - $package_ensure = 'present', - $os_actions_endpoint_type = $facts['os_service_default'], - $control_exchange = $facts['os_service_default'], - $rpc_response_timeout = $facts['os_service_default'], - $default_transport_url = $facts['os_service_default'], - $notification_transport_url = $facts['os_service_default'], - $notification_driver = $facts['os_service_default'], - $notification_topics = $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_qos_prefetch_count = $facts['os_service_default'], - $rabbit_quorum_queue = $facts['os_service_default'], - $rabbit_transient_queues_ttl = $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_use_ssl = $facts['os_service_default'], - $service_down_time = $facts['os_service_default'], - $report_interval = $facts['os_service_default'], - $kombu_failover_strategy = $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'], - $amqp_durable_queues = $facts['os_service_default'], - $amqp_auto_delete = $facts['os_service_default'], - Boolean $purge_config = false, - Boolean $sync_db = true, - $max_missed_heartbeats = $facts['os_service_default'], - $check_interval = $facts['os_service_default'], - $first_heartbeat_timeout = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = present, + $os_actions_endpoint_type = $facts['os_service_default'], + $control_exchange = $facts['os_service_default'], + $rpc_response_timeout = $facts['os_service_default'], + $default_transport_url = $facts['os_service_default'], + $notification_transport_url = $facts['os_service_default'], + $notification_driver = $facts['os_service_default'], + $notification_topics = $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_qos_prefetch_count = $facts['os_service_default'], + $rabbit_quorum_queue = $facts['os_service_default'], + $rabbit_transient_queues_ttl = $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_use_ssl = $facts['os_service_default'], + $service_down_time = $facts['os_service_default'], + $report_interval = $facts['os_service_default'], + $kombu_failover_strategy = $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'], + $amqp_durable_queues = $facts['os_service_default'], + $amqp_auto_delete = $facts['os_service_default'], + Boolean $purge_config = false, + Boolean $sync_db = true, + $max_missed_heartbeats = $facts['os_service_default'], + $check_interval = $facts['os_service_default'], + $first_heartbeat_timeout = $facts['os_service_default'], ) { include mistral::deps include mistral::params diff --git a/manifests/notifier.pp b/manifests/notifier.pp index 3289eb6..f12c64a 100644 --- a/manifests/notifier.pp +++ b/manifests/notifier.pp @@ -42,13 +42,13 @@ # Defaults to $facts['os_service_default']. # class mistral::notifier ( - $package_ensure = present, - Boolean $manage_service = true, - Boolean $enabled = true, - Enum['local', 'remote'] $type = 'remote', - $host = $facts['os_service_default'], - $topic = $facts['os_service_default'], - $notify_publishers = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = present, + Boolean $manage_service = true, + Boolean $enabled = true, + Enum['local', 'remote'] $type = 'remote', + $host = $facts['os_service_default'], + $topic = $facts['os_service_default'], + $notify_publishers = $facts['os_service_default'], ) { include mistral::deps include mistral::params diff --git a/metadata.json b/metadata.json index 2731469..bf9d1f5 100644 --- a/metadata.json +++ b/metadata.json @@ -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",