diff --git a/manifests/api.pp b/manifests/api.pp index b743cbc1..7fe8208f 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -52,17 +52,17 @@ # Defaults to undef # class heat::api ( - $package_ensure = 'present', - Boolean $manage_service = true, - Boolean $enabled = true, - $service_name = $heat::params::api_service_name, + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $manage_service = true, + Boolean $enabled = true, + $service_name = $heat::params::api_service_name, # DEPRECATED PARAMETERS - $bind_host = undef, - $bind_port = undef, - $workers = undef, - $use_ssl = undef, - $cert_file = undef, - $key_file = undef, + $bind_host = undef, + $bind_port = undef, + $workers = undef, + $use_ssl = undef, + $cert_file = undef, + $key_file = undef, ) inherits heat::params { include heat include heat::deps diff --git a/manifests/api_cfn.pp b/manifests/api_cfn.pp index c661ed81..00f7236a 100644 --- a/manifests/api_cfn.pp +++ b/manifests/api_cfn.pp @@ -55,17 +55,17 @@ # Defaults to undef # class heat::api_cfn ( - $package_ensure = 'present', - Boolean $manage_service = true, - Boolean $enabled = true, - $service_name = $heat::params::api_cfn_service_name, + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $manage_service = true, + Boolean $enabled = true, + $service_name = $heat::params::api_cfn_service_name, # DEPRECATED PARAMETERS - $bind_host = undef, - $bind_port = undef, - $workers = undef, - $use_ssl = undef, - $cert_file = undef, - $key_file = undef, + $bind_host = undef, + $bind_port = undef, + $workers = undef, + $use_ssl = undef, + $cert_file = undef, + $key_file = undef, ) inherits heat::params { include heat include heat::deps diff --git a/manifests/client.pp b/manifests/client.pp index 996907f6..51d5dd31 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -6,9 +6,10 @@ # # [*ensure*] # (Optional) Ensure state for package. +# Defaults to 'present'. # class heat::client ( - $ensure = 'present' + Stdlib::Ensure::Package $ensure = 'present' ) { include heat::deps include heat::params diff --git a/manifests/engine.pp b/manifests/engine.pp index f00aef37..1591c9ad 100644 --- a/manifests/engine.pp +++ b/manifests/engine.pp @@ -212,7 +212,7 @@ # class heat::engine ( Heat::AuthEncryptionKey $auth_encryption_key, - $package_ensure = 'present', + Stdlib::Ensure::Package $package_ensure = 'present', Boolean $manage_service = true, Boolean $enabled = true, $heat_stack_user_role = $facts['os_service_default'], diff --git a/manifests/init.pp b/manifests/init.pp index d885b937..5fd066bb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -233,54 +233,54 @@ # Defaults to undef. # class heat ( - $package_ensure = 'present', - $keystone_ec2_uri = $facts['os_service_default'], - $default_transport_url = $facts['os_service_default'], - $rpc_response_timeout = $facts['os_service_default'], - $control_exchange = $facts['os_service_default'], - $executor_thread_pool_size = $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_quorum_queue = $facts['os_service_default'], - $rabbit_transient_queues_ttl = $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'], - $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'], - $host = $facts['os_service_default'], - $flavor = $facts['os_service_default'], - $region_name = $facts['os_service_default'], - $max_template_size = $facts['os_service_default'], - $max_json_body_size = $facts['os_service_default'], - $template_fetch_timeout = $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'], - $enable_proxy_headers_parsing = $facts['os_service_default'], - $max_request_body_size = $facts['os_service_default'], - Boolean $purge_config = false, - $auth_strategy = 'keystone', - $yaql_memory_quota = $facts['os_service_default'], - $yaql_limit_iterators = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', + $keystone_ec2_uri = $facts['os_service_default'], + $default_transport_url = $facts['os_service_default'], + $rpc_response_timeout = $facts['os_service_default'], + $control_exchange = $facts['os_service_default'], + $executor_thread_pool_size = $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_quorum_queue = $facts['os_service_default'], + $rabbit_transient_queues_ttl = $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'], + $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'], + $host = $facts['os_service_default'], + $flavor = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $max_template_size = $facts['os_service_default'], + $max_json_body_size = $facts['os_service_default'], + $template_fetch_timeout = $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'], + $enable_proxy_headers_parsing = $facts['os_service_default'], + $max_request_body_size = $facts['os_service_default'], + Boolean $purge_config = false, + $auth_strategy = 'keystone', + $yaql_memory_quota = $facts['os_service_default'], + $yaql_limit_iterators = $facts['os_service_default'], # DEPRECATED PARAMETERS - $enable_stack_adopt = undef, - $enable_stack_abandon = undef, + $enable_stack_adopt = undef, + $enable_stack_abandon = undef, ) { include heat::db include heat::deps diff --git a/metadata.json b/metadata.json index 038ae02a..4c62165c 100644 --- a/metadata.json +++ b/metadata.json @@ -11,7 +11,7 @@ }, { "name": "puppetlabs/stdlib", - "version_requirement": ">=5.0.0 <10.0.0" + "version_requirement": ">=9.0.0 <10.0.0" }, { "name": "openstack/openstacklib",