openstack/puppet-ironic
Code Issues Proposed changes

Ensure purge_config takes a boolean value

Browse Source 
The purge_config parameters only accept boolean values. This enforces
that using the typed parameters.

This also adds a few boolean type enforcements to the ironic class
parameters, which were overlooked during the past attempt to add
boolean parameter validations.

Change-Id: I6a8e812ad92083eb2f139d535a33fd0a05773c13
This commit is contained in:
Takashi Kajinami 2023-07-18 01:01:30 +09:00
parent 7c5b921065
commit af81e83aeb
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/init.pp
View File

@ -241,7 +241,7 @@
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
class ironic ( class ironic (
$enabled = true, Boolean $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
$my_ip = $facts['os_service_default'], $my_ip = $facts['os_service_default'],
$my_ipv6 = $facts['os_service_default'], $my_ipv6 = $facts['os_service_default'],
@ -280,9 +280,9 @@ class ironic (
$amqp_sasl_config_name = $facts['os_service_default'], $amqp_sasl_config_name = $facts['os_service_default'],
$amqp_username = $facts['os_service_default'], $amqp_username = $facts['os_service_default'],
$amqp_password = $facts['os_service_default'], $amqp_password = $facts['os_service_default'],
$sync_db = true, Boolean $sync_db = true,
$db_online_data_migrations = false, Boolean $db_online_data_migrations = false,
$purge_config = false, Boolean $purge_config = false,
$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'],
@ -300,7 +300,8 @@ class ironic (
ensure_resource( 'package', 'ironic-common', { ensure_resource( 'package', 'ironic-common', {
ensure => $package_ensure, ensure => $package_ensure,
name => $::ironic::params::common_package_name, name => $::ironic::params::common_package_name,
tag => ['openstack', 'ironic-package'],}) tag => ['openstack', 'ironic-package'],
})
package { 'ironic-lib': package { 'ironic-lib':
ensure => $package_ensure, ensure => $package_ensure,

2
manifests/inspector/policy.pp
View File

@ -52,7 +52,7 @@ class ironic::inspector::policy (
$policy_path = '/etc/ironic-inspector/policy.yaml', $policy_path = '/etc/ironic-inspector/policy.yaml',
$policy_default_rule = $facts['os_service_default'], $policy_default_rule = $facts['os_service_default'],
$policy_dirs = $facts['os_service_default'], $policy_dirs = $facts['os_service_default'],
$purge_config = false, Boolean $purge_config = false,
) { ) {
include ironic::deps include ironic::deps

2
manifests/policy.pp
View File

@ -52,7 +52,7 @@ class ironic::policy (
$policy_path = '/etc/ironic/policy.yaml', $policy_path = '/etc/ironic/policy.yaml',
$policy_default_rule = $facts['os_service_default'], $policy_default_rule = $facts['os_service_default'],
$policy_dirs = $facts['os_service_default'], $policy_dirs = $facts['os_service_default'],
$purge_config = false, Boolean $purge_config = false,
) { ) {
include ironic::deps include ironic::deps