diff --git a/manifests/api.pp b/manifests/api.pp index b5316eb7..59ff37c1 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -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 diff --git a/manifests/client.pp b/manifests/client.pp index ac8cc9f4..e657f4d0 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -27,7 +27,7 @@ # # class ironic::client ( - $package_ensure = present + Stdlib::Ensure::Package $package_ensure = present, ) { include ironic::deps include ironic::params diff --git a/manifests/conductor.pp b/manifests/conductor.pp index f2a78fa8..b2794009 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -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 diff --git a/manifests/drivers/ansible.pp b/manifests/drivers/ansible.pp index 44715907..e0e3faf4 100644 --- a/manifests/drivers/ansible.pp +++ b/manifests/drivers/ansible.pp @@ -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 diff --git a/manifests/drivers/drac.pp b/manifests/drivers/drac.pp index b4746e0b..b258fb07 100644 --- a/manifests/drivers/drac.pp +++ b/manifests/drivers/drac.pp @@ -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'], diff --git a/manifests/drivers/ilo.pp b/manifests/drivers/ilo.pp index 39f12649..9b94fcc3 100644 --- a/manifests/drivers/ilo.pp +++ b/manifests/drivers/ilo.pp @@ -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 diff --git a/manifests/drivers/redfish.pp b/manifests/drivers/redfish.pp index b7e10349..d096849e 100644 --- a/manifests/drivers/redfish.pp +++ b/manifests/drivers/redfish.pp @@ -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 diff --git a/manifests/init.pp b/manifests/init.pp index 39b3b0fb..39569fc7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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 diff --git a/manifests/inspector.pp b/manifests/inspector.pp index fe5e93af..194825c3 100644 --- a/manifests/inspector.pp +++ b/manifests/inspector.pp @@ -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'], diff --git a/manifests/inspector/client.pp b/manifests/inspector/client.pp index e4ecfe79..7d84a5b3 100644 --- a/manifests/inspector/client.pp +++ b/manifests/inspector/client.pp @@ -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 diff --git a/manifests/pxe.pp b/manifests/pxe.pp index 15019ff5..a09286de 100644 --- a/manifests/pxe.pp +++ b/manifests/pxe.pp @@ -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', diff --git a/manifests/reports.pp b/manifests/reports.pp index 1a666aa4..457dc2fc 100644 --- a/manifests/reports.pp +++ b/manifests/reports.pp @@ -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 diff --git a/manifests/vnc.pp b/manifests/vnc.pp index e80564cf..9d382a68 100644 --- a/manifests/vnc.pp +++ b/manifests/vnc.pp @@ -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