openstack/puppet-ironic
Code Issues Proposed changes

Validate ensure parameter for package resources

Browse Source 
The minimum version of puppetlabs-stdlib has been bumped globally, so
now we can use the common type definition.

Change-Id: Id05e7d78967eac898ddf8fe5f66d58722cbe7ace
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-23 18:15:47 +09:00
parent a8c25be7f8
commit 3eac2ca560
13 changed files with 164 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/api.pp
View File

@@ -74,17 +74,17 @@
# Defaults to $facts['os_service_default'].
#
class ironic::api (
$package_ensure = 'present',
Boolean $manage_service = true,
Boolean $enabled = true,
$service_name = $ironic::params::api_service,
$host_ip = $facts['os_service_default'],
$port = $facts['os_service_default'],
$max_limit = $facts['os_service_default'],
$workers = $facts['os_service_default'],
$public_endpoint = $facts['os_service_default'],
$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,
$service_name = $ironic::params::api_service,
$host_ip = $facts['os_service_default'],
$port = $facts['os_service_default'],
$max_limit = $facts['os_service_default'],
$workers = $facts['os_service_default'],
$public_endpoint = $facts['os_service_default'],
$enable_proxy_headers_parsing = $facts['os_service_default'],
$max_request_body_size = $facts['os_service_default'],
) inherits ironic::params {
include ironic::deps
include ironic::params

2
manifests/client.pp
View File

@@ -27,7 +27,7 @@
#
#
class ironic::client (
$package_ensure = present
Stdlib::Ensure::Package $package_ensure = present,
) {
include ironic::deps
include ironic::params

94
manifests/conductor.pp
View File

@@ -264,55 +264,55 @@
# Defaults to $facts['os_service_default']
#
class ironic::conductor (
$package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
$enabled_hardware_types = $facts['os_service_default'],
$force_power_state_during_sync = $facts['os_service_default'],
$http_url = $facts['os_service_default'],
Stdlib::Absolutepath $http_root = '/httpboot',
$force_raw_images = $facts['os_service_default'],
$automated_clean = $facts['os_service_default'],
$cleaning_network = $facts['os_service_default'],
Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
$enabled_hardware_types = $facts['os_service_default'],
$force_power_state_during_sync = $facts['os_service_default'],
$http_url = $facts['os_service_default'],
Stdlib::Absolutepath $http_root = '/httpboot',
$force_raw_images = $facts['os_service_default'],
$automated_clean = $facts['os_service_default'],
$cleaning_network = $facts['os_service_default'],
Optional[Enum['full', 'metadata', 'none']] $cleaning_disk_erase
= undef,
$continue_if_disk_secure_erase_fails = $facts['os_service_default'],
$provisioning_network = $facts['os_service_default'],
$rescuing_network = $facts['os_service_default'],
$inspection_network = $facts['os_service_default'],
$configdrive_use_object_store = $facts['os_service_default'],
$configdrive_swift_container = $facts['os_service_default'],
$inspect_wait_timeout = $facts['os_service_default'],
$default_boot_option = $facts['os_service_default'],
$default_boot_mode = $facts['os_service_default'],
$port_setup_delay = $facts['os_service_default'],
$soft_power_off_timeout = $facts['os_service_default'],
$power_state_change_timeout = $facts['os_service_default'],
$sync_power_state_interval = $facts['os_service_default'],
$sync_power_state_workers = $facts['os_service_default'],
$power_state_sync_max_retries = $facts['os_service_default'],
$power_failure_recovery_interval = $facts['os_service_default'],
$periodic_max_workers = $facts['os_service_default'],
$graceful_shutdown_timeout = $facts['os_service_default'],
$conductor_group = $facts['os_service_default'],
$deploy_kernel = $facts['os_service_default'],
$deploy_ramdisk = $facts['os_service_default'],
$deploy_kernel_by_arch = $facts['os_service_default'],
$deploy_ramdisk_by_arch = $facts['os_service_default'],
$rescue_kernel = $facts['os_service_default'],
$rescue_ramdisk = $facts['os_service_default'],
$rescue_kernel_by_arch = $facts['os_service_default'],
$rescue_ramdisk_by_arch = $facts['os_service_default'],
$bootloader = $facts['os_service_default'],
$bootloader_by_arch = $facts['os_service_default'],
$error_on_ramdisk_config_inconsistency = $facts['os_service_default'],
$allow_provisioning_in_maintenance = $facts['os_service_default'],
$image_download_concurrency = $facts['os_service_default'],
$deploy_callback_timeout = $facts['os_service_default'],
$heartbeat_interval = $facts['os_service_default'],
$heartbeat_timeout = $facts['os_service_default'],
$max_concurrent_deploy = $facts['os_service_default'],
$max_concurrent_clean = $facts['os_service_default'],
$continue_if_disk_secure_erase_fails = $facts['os_service_default'],
$provisioning_network = $facts['os_service_default'],
$rescuing_network = $facts['os_service_default'],
$inspection_network = $facts['os_service_default'],
$configdrive_use_object_store = $facts['os_service_default'],
$configdrive_swift_container = $facts['os_service_default'],
$inspect_wait_timeout = $facts['os_service_default'],
$default_boot_option = $facts['os_service_default'],
$default_boot_mode = $facts['os_service_default'],
$port_setup_delay = $facts['os_service_default'],
$soft_power_off_timeout = $facts['os_service_default'],
$power_state_change_timeout = $facts['os_service_default'],
$sync_power_state_interval = $facts['os_service_default'],
$sync_power_state_workers = $facts['os_service_default'],
$power_state_sync_max_retries = $facts['os_service_default'],
$power_failure_recovery_interval = $facts['os_service_default'],
$periodic_max_workers = $facts['os_service_default'],
$graceful_shutdown_timeout = $facts['os_service_default'],
$conductor_group = $facts['os_service_default'],
$deploy_kernel = $facts['os_service_default'],
$deploy_ramdisk = $facts['os_service_default'],
$deploy_kernel_by_arch = $facts['os_service_default'],
$deploy_ramdisk_by_arch = $facts['os_service_default'],
$rescue_kernel = $facts['os_service_default'],
$rescue_ramdisk = $facts['os_service_default'],
$rescue_kernel_by_arch = $facts['os_service_default'],
$rescue_ramdisk_by_arch = $facts['os_service_default'],
$bootloader = $facts['os_service_default'],
$bootloader_by_arch = $facts['os_service_default'],
$error_on_ramdisk_config_inconsistency = $facts['os_service_default'],
$allow_provisioning_in_maintenance = $facts['os_service_default'],
$image_download_concurrency = $facts['os_service_default'],
$deploy_callback_timeout = $facts['os_service_default'],
$heartbeat_interval = $facts['os_service_default'],
$heartbeat_timeout = $facts['os_service_default'],
$max_concurrent_deploy = $facts['os_service_default'],
$max_concurrent_clean = $facts['os_service_default'],
) {
include ironic::deps
include ironic::params

24
manifests/drivers/ansible.pp
View File

@@ -67,18 +67,18 @@
# Defaults to $facts['os_service_default']
#
class ironic::drivers::ansible (
$package_ensure = 'present',
$ansible_extra_args = $facts['os_service_default'],
$playbooks_path = $facts['os_service_default'],
$config_file_path = $facts['os_service_default'],
$image_store_insecure = $facts['os_service_default'],
$default_username = $facts['os_service_default'],
$default_key_file = $facts['os_service_default'],
$default_deploy_playbook = $facts['os_service_default'],
$default_shutdown_playbook = $facts['os_service_default'],
$default_clean_playbook = $facts['os_service_default'],
$default_clean_steps_config = $facts['os_service_default'],
$default_python_interpreter = $facts['os_service_default'],
Stdlib::Ensure::Package $package_ensure = 'present',
$ansible_extra_args = $facts['os_service_default'],
$playbooks_path = $facts['os_service_default'],
$config_file_path = $facts['os_service_default'],
$image_store_insecure = $facts['os_service_default'],
$default_username = $facts['os_service_default'],
$default_key_file = $facts['os_service_default'],
$default_deploy_playbook = $facts['os_service_default'],
$default_shutdown_playbook = $facts['os_service_default'],
$default_clean_playbook = $facts['os_service_default'],
$default_clean_steps_config = $facts['os_service_default'],
$default_python_interpreter = $facts['os_service_default'],
) {
include ironic::deps
include ironic::params

2
manifests/drivers/drac.pp
View File

@@ -47,7 +47,7 @@
# Defaults to $facts['os_service_default']
#
class ironic::drivers::drac (
$package_ensure = 'present',
Stdlib::Ensure::Package $package_ensure = 'present',
$query_raid_config_job_status_interval = $facts['os_service_default'],
$boot_device_job_status_timeout = $facts['os_service_default'],
$config_job_max_retries = $facts['os_service_default'],

10
manifests/drivers/ilo.pp
View File

@@ -39,11 +39,11 @@
# Defaults to 'present'
#
class ironic::drivers::ilo (
$client_timeout = $facts['os_service_default'],
$client_port = $facts['os_service_default'],
$use_web_server_for_images = $facts['os_service_default'],
$default_boot_mode = $facts['os_service_default'],
$package_ensure = 'present',
$client_timeout = $facts['os_service_default'],
$client_port = $facts['os_service_default'],
$use_web_server_for_images = $facts['os_service_default'],
$default_boot_mode = $facts['os_service_default'],
Stdlib::Ensure::Package $package_ensure = 'present',
) {
include ironic::deps
include ironic::params

34
manifests/drivers/redfish.pp
View File

@@ -92,23 +92,23 @@
# Defaults to $facts['os_service_default']
#
class ironic::drivers::redfish (
$package_ensure = 'present',
$connection_attempts = $facts['os_service_default'],
$connection_retry_interval = $facts['os_service_default'],
$connection_cache_size = $facts['os_service_default'],
$auth_type = $facts['os_service_default'],
$use_swift = $facts['os_service_default'],
$swift_container = $facts['os_service_default'],
$swift_object_expiry_timeout = $facts['os_service_default'],
$kernel_append_params = $facts['os_service_default'],
$file_permission = $facts['os_service_default'],
$firmware_update_status_interval = $facts['os_service_default'],
$firmware_update_fail_interval = $facts['os_service_default'],
$firmware_update_wait_unresponsive_bmc = $facts['os_service_default'],
$firmware_source = $facts['os_service_default'],
$raid_config_status_interval = $facts['os_service_default'],
$raid_config_fail_interval = $facts['os_service_default'],
$boot_mode_config_timeout = $facts['os_service_default'],
Stdlib::Ensure::Package $package_ensure = 'present',
$connection_attempts = $facts['os_service_default'],
$connection_retry_interval = $facts['os_service_default'],
$connection_cache_size = $facts['os_service_default'],
$auth_type = $facts['os_service_default'],
$use_swift = $facts['os_service_default'],
$swift_container = $facts['os_service_default'],
$swift_object_expiry_timeout = $facts['os_service_default'],
$kernel_append_params = $facts['os_service_default'],
$file_permission = $facts['os_service_default'],
$firmware_update_status_interval = $facts['os_service_default'],
$firmware_update_fail_interval = $facts['os_service_default'],
$firmware_update_wait_unresponsive_bmc = $facts['os_service_default'],
$firmware_source = $facts['os_service_default'],
$raid_config_status_interval = $facts['os_service_default'],
$raid_config_fail_interval = $facts['os_service_default'],
$boot_mode_config_timeout = $facts['os_service_default'],
) {
include ironic::deps
include ironic::params

92
manifests/init.pp
View File

@@ -241,52 +241,52 @@
# Defaults to 'services'
#
class ironic (
Boolean $enabled = true,
$package_ensure = 'present',
$host = $facts['os_service_default'],
$my_ip = $facts['os_service_default'],
$my_ipv6 = $facts['os_service_default'],
$auth_strategy = 'keystone',
$default_resource_class = $facts['os_service_default'],
$control_exchange = $facts['os_service_default'],
$executor_thread_pool_size = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'],
$rpc_transport = $facts['os_service_default'],
$default_transport_url = $facts['os_service_default'],
$rabbit_use_ssl = $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_ha_queues = $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'],
$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'],
Boolean $sync_db = true,
Boolean $db_online_data_migrations = false,
Boolean $purge_config = false,
$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'],
$notification_level = $facts['os_service_default'],
$versioned_notifications_topics = $facts['os_service_default'],
$rbac_service_role_elevated_access = $facts['os_service_default'],
$rbac_service_project_name = 'services',
Boolean $enabled = true,
Stdlib::Ensure::Package $package_ensure = 'present',
$host = $facts['os_service_default'],
$my_ip = $facts['os_service_default'],
$my_ipv6 = $facts['os_service_default'],
$auth_strategy = 'keystone',
$default_resource_class = $facts['os_service_default'],
$control_exchange = $facts['os_service_default'],
$executor_thread_pool_size = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'],
$rpc_transport = $facts['os_service_default'],
$default_transport_url = $facts['os_service_default'],
$rabbit_use_ssl = $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_ha_queues = $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'],
$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'],
Boolean $sync_db = true,
Boolean $db_online_data_migrations = false,
Boolean $purge_config = false,
$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'],
$notification_level = $facts['os_service_default'],
$versioned_notifications_topics = $facts['os_service_default'],
$rbac_service_role_elevated_access = $facts['os_service_default'],
$rbac_service_project_name = 'services',
) {
include ironic::deps
include ironic::db

2
manifests/inspector.pp
View File

@@ -330,7 +330,7 @@
# Defaults to true
#
class ironic::inspector (
$package_ensure = 'present',
Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $manage_service = true,
Boolean $enabled = true,
$host = $facts['os_service_default'],

2
manifests/inspector/client.pp
View File

@@ -9,7 +9,7 @@
# Defaults to present
#
class ironic::inspector::client (
$package_ensure = present
Stdlib::Ensure::Package $package_ensure = present,
) {
include ironic::deps
include ironic::params

2
manifests/pxe.pp
View File

@@ -104,7 +104,7 @@
# Defaults to {}
#
class ironic::pxe (
$package_ensure = 'present',
Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $manage_service = true,
Boolean $enabled = true,
Stdlib::Absolutepath $tftp_root = '/tftpboot',

10
manifests/reports.pp
View File

@@ -26,11 +26,11 @@
# Defaults to true
#
class ironic::reports (
$log_dir = $facts['os_service_default'],
$file_event_handler = $facts['os_service_default'],
$file_event_handler_interval = $facts['os_service_default'],
$package_ensure = 'present',
Boolean $manage_package = true,
$log_dir = $facts['os_service_default'],
$file_event_handler = $facts['os_service_default'],
$file_event_handler_interval = $facts['os_service_default'],
Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $manage_package = true,
) {
include ironic::deps

32
manifests/vnc.pp
View File

@@ -73,22 +73,22 @@
# Defaults to $facts['os_service_default']
#
class ironic::vnc (
$package_ensure = present,
Boolean $enabled = true,
Boolean $manage_service = true,
$host_ip = $facts['os_service_default'],
$port = $facts['os_service_default'],
$public_url = $facts['os_service_default'],
$enable_ssl = $facts['os_service_default'],
$novnc_web = $facts['os_service_default'],
$novnc_record = $facts['os_service_default'],
$novnc_auth_schemes = $facts['os_service_default'],
$token_timeout = $facts['os_service_default'],
$expire_console_session_interval = $facts['os_service_default'],
$ssl_cert_file = $facts['os_service_default'],
$ssl_key_file = $facts['os_service_default'],
$ssl_minimum_version = $facts['os_service_default'],
$ssl_ciphers = $facts['os_service_default'],
Stdlib::Ensure::Package $package_ensure = present,
Boolean $enabled = true,
Boolean $manage_service = true,
$host_ip = $facts['os_service_default'],
$port = $facts['os_service_default'],
$public_url = $facts['os_service_default'],
$enable_ssl = $facts['os_service_default'],
$novnc_web = $facts['os_service_default'],
$novnc_record = $facts['os_service_default'],
$novnc_auth_schemes = $facts['os_service_default'],
$token_timeout = $facts['os_service_default'],
$expire_console_session_interval = $facts['os_service_default'],
$ssl_cert_file = $facts['os_service_default'],
$ssl_key_file = $facts['os_service_default'],
$ssl_minimum_version = $facts['os_service_default'],
$ssl_ciphers = $facts['os_service_default'],
) inherits ironic::params {
include ironic::deps