From e65812c1f7fd1dabe7b477672f5ceb92ce2b8412 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 23 Sep 2025 17:12:19 +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: I59635d01085d31ce107493a03568545d83865c57 Signed-off-by: Takashi Kajinami --- manifests/api.pp | 20 +++++----- manifests/client.pp | 2 +- manifests/init.pp | 88 +++++++++++++++++++++--------------------- manifests/processor.pp | 24 ++++++------ 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/manifests/api.pp b/manifests/api.pp index 437a33b..8d64817 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -50,16 +50,16 @@ # Defaults to $facts['os_service_default']. # class cloudkitty::api ( - $package_ensure = 'present', - Boolean $manage_service = true, - Boolean $enabled = true, - $host_ip = $facts['os_service_default'], - $port = $facts['os_service_default'], - $pecan_debug = $facts['os_service_default'], - Boolean $sync_db = true, - $service_name = 'httpd', - $enable_proxy_headers_parsing = $facts['os_service_default'], - $max_request_body_size = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $manage_service = true, + Boolean $enabled = true, + $host_ip = $facts['os_service_default'], + $port = $facts['os_service_default'], + $pecan_debug = $facts['os_service_default'], + Boolean $sync_db = true, + $service_name = 'httpd', + $enable_proxy_headers_parsing = $facts['os_service_default'], + $max_request_body_size = $facts['os_service_default'], ) { include cloudkitty include cloudkitty::deps diff --git a/manifests/client.pp b/manifests/client.pp index 1e4e914..42424f9 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -9,7 +9,7 @@ # Defaults to 'present'. # class cloudkitty::client ( - $ensure = 'present' + Stdlib::Ensure::Package $ensure = 'present' ) { include cloudkitty::deps include cloudkitty::params diff --git a/manifests/init.pp b/manifests/init.pp index 03d1de1..530c9e4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -211,50 +211,50 @@ # Defaults to undef # class cloudkitty ( - $package_ensure = 'present', - $rabbit_use_ssl = $facts['os_service_default'], - $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'], - $rabbit_heartbeat_rate = $facts['os_service_default'], - $rabbit_ha_queues = $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'], - $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_failover_strategy = $facts['os_service_default'], - $kombu_compression = $facts['os_service_default'], - $amqp_durable_queues = $facts['os_service_default'], - $amqp_auto_delete = $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, - $auth_strategy = 'keystone', - $api_paste_config = $facts['os_service_default'], - $host = $facts['os_service_default'], - $state_backend = $facts['os_service_default'], - $state_basepath = $facts['os_service_default'], - $output_backend = $facts['os_service_default'], - $output_basepath = $facts['os_service_default'], - $pipeline = $facts['os_service_default'], - $storage_backend = $facts['os_service_default'], - $storage_version = $facts['os_service_default'], - $fetcher_backend = $facts['os_service_default'], - Optional[Hash] $metrics_config = undef, + Stdlib::Ensure::Package $package_ensure = 'present', + $rabbit_use_ssl = $facts['os_service_default'], + $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'], + $rabbit_heartbeat_rate = $facts['os_service_default'], + $rabbit_ha_queues = $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'], + $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_failover_strategy = $facts['os_service_default'], + $kombu_compression = $facts['os_service_default'], + $amqp_durable_queues = $facts['os_service_default'], + $amqp_auto_delete = $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, + $auth_strategy = 'keystone', + $api_paste_config = $facts['os_service_default'], + $host = $facts['os_service_default'], + $state_backend = $facts['os_service_default'], + $state_basepath = $facts['os_service_default'], + $output_backend = $facts['os_service_default'], + $output_basepath = $facts['os_service_default'], + $pipeline = $facts['os_service_default'], + $storage_backend = $facts['os_service_default'], + $storage_version = $facts['os_service_default'], + $fetcher_backend = $facts['os_service_default'], + Optional[Hash] $metrics_config = undef, ) { include cloudkitty::params include cloudkitty::db diff --git a/manifests/processor.pp b/manifests/processor.pp index 1f60cbd..fc78d20 100644 --- a/manifests/processor.pp +++ b/manifests/processor.pp @@ -53,18 +53,18 @@ # Default to $facts['os_service_default'] # class cloudkitty::processor ( - $package_ensure = 'present', - Boolean $manage_service = true, - Boolean $enabled = true, - $collector = 'gnocchi', - $window = $facts['os_service_default'], - $period = $facts['os_service_default'], - $wait_periods = $facts['os_service_default'], - $services = $facts['os_service_default'], - $auth_type = 'password', - $auth_section = 'keystone_authtoken', - $region_name = $facts['os_service_default'], - $interface = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $manage_service = true, + Boolean $enabled = true, + $collector = 'gnocchi', + $window = $facts['os_service_default'], + $period = $facts['os_service_default'], + $wait_periods = $facts['os_service_default'], + $services = $facts['os_service_default'], + $auth_type = 'password', + $auth_section = 'keystone_authtoken', + $region_name = $facts['os_service_default'], + $interface = $facts['os_service_default'], ) { include cloudkitty::deps include cloudkitty::params