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: I9f44215d2806653aec84076414f1ae20d8b7c1ec
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-23 17:34:13 +09:00
parent 213c858298
commit 84eb74d6e4
6 changed files with 71 additions and 70 deletions

View File

@@ -52,17 +52,17 @@
# Defaults to undef # Defaults to undef
# #
class heat::api ( class heat::api (
$package_ensure = 'present', Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $manage_service = true, Boolean $manage_service = true,
Boolean $enabled = true, Boolean $enabled = true,
$service_name = $heat::params::api_service_name, $service_name = $heat::params::api_service_name,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$bind_host = undef, $bind_host = undef,
$bind_port = undef, $bind_port = undef,
$workers = undef, $workers = undef,
$use_ssl = undef, $use_ssl = undef,
$cert_file = undef, $cert_file = undef,
$key_file = undef, $key_file = undef,
) inherits heat::params { ) inherits heat::params {
include heat include heat
include heat::deps include heat::deps

View File

@@ -55,17 +55,17 @@
# Defaults to undef # Defaults to undef
# #
class heat::api_cfn ( class heat::api_cfn (
$package_ensure = 'present', Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $manage_service = true, Boolean $manage_service = true,
Boolean $enabled = true, Boolean $enabled = true,
$service_name = $heat::params::api_cfn_service_name, $service_name = $heat::params::api_cfn_service_name,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$bind_host = undef, $bind_host = undef,
$bind_port = undef, $bind_port = undef,
$workers = undef, $workers = undef,
$use_ssl = undef, $use_ssl = undef,
$cert_file = undef, $cert_file = undef,
$key_file = undef, $key_file = undef,
) inherits heat::params { ) inherits heat::params {
include heat include heat
include heat::deps include heat::deps

View File

@@ -6,9 +6,10 @@
# #
# [*ensure*] # [*ensure*]
# (Optional) Ensure state for package. # (Optional) Ensure state for package.
# Defaults to 'present'.
# #
class heat::client ( class heat::client (
$ensure = 'present' Stdlib::Ensure::Package $ensure = 'present'
) { ) {
include heat::deps include heat::deps
include heat::params include heat::params

View File

@@ -212,7 +212,7 @@
# #
class heat::engine ( class heat::engine (
Heat::AuthEncryptionKey $auth_encryption_key, Heat::AuthEncryptionKey $auth_encryption_key,
$package_ensure = 'present', Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $manage_service = true, Boolean $manage_service = true,
Boolean $enabled = true, Boolean $enabled = true,
$heat_stack_user_role = $facts['os_service_default'], $heat_stack_user_role = $facts['os_service_default'],

View File

@@ -233,54 +233,54 @@
# Defaults to undef. # Defaults to undef.
# #
class heat ( class heat (
$package_ensure = 'present', Stdlib::Ensure::Package $package_ensure = 'present',
$keystone_ec2_uri = $facts['os_service_default'], $keystone_ec2_uri = $facts['os_service_default'],
$default_transport_url = $facts['os_service_default'], $default_transport_url = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'], $rpc_response_timeout = $facts['os_service_default'],
$control_exchange = $facts['os_service_default'], $control_exchange = $facts['os_service_default'],
$executor_thread_pool_size = $facts['os_service_default'], $executor_thread_pool_size = $facts['os_service_default'],
$rabbit_ha_queues = $facts['os_service_default'], $rabbit_ha_queues = $facts['os_service_default'],
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'], $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
$rabbit_heartbeat_rate = $facts['os_service_default'], $rabbit_heartbeat_rate = $facts['os_service_default'],
$rabbit_qos_prefetch_count = $facts['os_service_default'], $rabbit_qos_prefetch_count = $facts['os_service_default'],
$rabbit_quorum_queue = $facts['os_service_default'], $rabbit_quorum_queue = $facts['os_service_default'],
$rabbit_transient_quorum_queue = $facts['os_service_default'], $rabbit_transient_quorum_queue = $facts['os_service_default'],
$rabbit_transient_queues_ttl = $facts['os_service_default'], $rabbit_transient_queues_ttl = $facts['os_service_default'],
$rabbit_quorum_delivery_limit = $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_length = $facts['os_service_default'],
$rabbit_quorum_max_memory_bytes = $facts['os_service_default'], $rabbit_quorum_max_memory_bytes = $facts['os_service_default'],
$rabbit_use_queue_manager = $facts['os_service_default'], $rabbit_use_queue_manager = $facts['os_service_default'],
$rabbit_stream_fanout = $facts['os_service_default'], $rabbit_stream_fanout = $facts['os_service_default'],
$rabbit_enable_cancel_on_failover = $facts['os_service_default'], $rabbit_enable_cancel_on_failover = $facts['os_service_default'],
$rabbit_use_ssl = $facts['os_service_default'], $rabbit_use_ssl = $facts['os_service_default'],
$kombu_ssl_ca_certs = $facts['os_service_default'], $kombu_ssl_ca_certs = $facts['os_service_default'],
$kombu_ssl_certfile = $facts['os_service_default'], $kombu_ssl_certfile = $facts['os_service_default'],
$kombu_ssl_keyfile = $facts['os_service_default'], $kombu_ssl_keyfile = $facts['os_service_default'],
$kombu_ssl_version = $facts['os_service_default'], $kombu_ssl_version = $facts['os_service_default'],
$kombu_reconnect_delay = $facts['os_service_default'], $kombu_reconnect_delay = $facts['os_service_default'],
$kombu_failover_strategy = $facts['os_service_default'], $kombu_failover_strategy = $facts['os_service_default'],
$kombu_compression = $facts['os_service_default'], $kombu_compression = $facts['os_service_default'],
$amqp_durable_queues = $facts['os_service_default'], $amqp_durable_queues = $facts['os_service_default'],
$amqp_auto_delete = $facts['os_service_default'], $amqp_auto_delete = $facts['os_service_default'],
$host = $facts['os_service_default'], $host = $facts['os_service_default'],
$flavor = $facts['os_service_default'], $flavor = $facts['os_service_default'],
$region_name = $facts['os_service_default'], $region_name = $facts['os_service_default'],
$max_template_size = $facts['os_service_default'], $max_template_size = $facts['os_service_default'],
$max_json_body_size = $facts['os_service_default'], $max_json_body_size = $facts['os_service_default'],
$template_fetch_timeout = $facts['os_service_default'], $template_fetch_timeout = $facts['os_service_default'],
$notification_transport_url = $facts['os_service_default'], $notification_transport_url = $facts['os_service_default'],
$notification_driver = $facts['os_service_default'], $notification_driver = $facts['os_service_default'],
$notification_topics = $facts['os_service_default'], $notification_topics = $facts['os_service_default'],
$notification_retry = $facts['os_service_default'], $notification_retry = $facts['os_service_default'],
$enable_proxy_headers_parsing = $facts['os_service_default'], $enable_proxy_headers_parsing = $facts['os_service_default'],
$max_request_body_size = $facts['os_service_default'], $max_request_body_size = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
$auth_strategy = 'keystone', $auth_strategy = 'keystone',
$yaql_memory_quota = $facts['os_service_default'], $yaql_memory_quota = $facts['os_service_default'],
$yaql_limit_iterators = $facts['os_service_default'], $yaql_limit_iterators = $facts['os_service_default'],
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$enable_stack_adopt = undef, $enable_stack_adopt = undef,
$enable_stack_abandon = undef, $enable_stack_abandon = undef,
) { ) {
include heat::db include heat::db
include heat::deps include heat::deps

View File

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