From dbad032e33586748ef96caf03571fbbc75a0fc8d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 22 Jul 2023 23:50:59 +0900 Subject: [PATCH] Ensure purge_config takes a boolean value The purge_config parameters only accept boolean values. This enforces that using the typed parameters. Change-Id: I8fffedd98f7bef5a9bf065ee3a7850fb0222869d --- manifests/agents/bagpipe.pp | 2 +- manifests/agents/bgp_dragent.pp | 2 +- manifests/agents/dhcp.pp | 2 +- manifests/agents/l2gw.pp | 2 +- manifests/agents/l3.pp | 2 +- manifests/agents/metadata.pp | 2 +- manifests/agents/metering.pp | 2 +- manifests/agents/ml2/linuxbridge.pp | 2 +- manifests/agents/ml2/macvtap.pp | 2 +- manifests/agents/ml2/networking_baremetal.pp | 2 +- manifests/agents/ml2/ovn.pp | 2 +- manifests/agents/ml2/ovs.pp | 2 +- manifests/agents/ml2/sriov.pp | 2 +- manifests/agents/ovn_metadata.pp | 2 +- manifests/agents/vpnaas.pp | 2 +- manifests/init.pp | 2 +- manifests/plugins/ml2.pp | 2 +- manifests/plugins/ml2/nuage.pp | 2 +- manifests/policy.pp | 2 +- manifests/services/l2gw.pp | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/manifests/agents/bagpipe.pp b/manifests/agents/bagpipe.pp index a8ee48237..dbf041c65 100644 --- a/manifests/agents/bagpipe.pp +++ b/manifests/agents/bagpipe.pp @@ -91,7 +91,7 @@ class neutron::agents::bagpipe ( $package_ensure = 'present', $peers = $facts['os_service_default'], $proxy_arp = false, - $purge_config = false, + Boolean $purge_config = false, $local_address = $facts['networking']['ip'], ) { diff --git a/manifests/agents/bgp_dragent.pp b/manifests/agents/bgp_dragent.pp index e9c3a3ad8..8bb759618 100644 --- a/manifests/agents/bgp_dragent.pp +++ b/manifests/agents/bgp_dragent.pp @@ -51,7 +51,7 @@ class neutron::agents::bgp_dragent( Boolean $manage_service = true, $bgp_speaker_driver = 'neutron_dynamic_routing.services.bgp.agent.driver.os_ken.driver.OsKenBgpDriver', $bgp_router_id = $facts['networking']['ip'], - $purge_config = false, + Boolean $purge_config = false, ) { include neutron::deps diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp index 4949bf928..49ae56dab 100644 --- a/manifests/agents/dhcp.pp +++ b/manifests/agents/dhcp.pp @@ -145,7 +145,7 @@ class neutron::agents::dhcp ( Boolean $enable_force_metadata = false, Boolean $enable_metadata_network = false, $dhcp_broadcast_reply = $facts['os_service_default'], - $purge_config = false, + Boolean $purge_config = false, $availability_zone = $facts['os_service_default'], $ovs_integration_bridge = $facts['os_service_default'], $ovsdb_connection = $facts['os_service_default'], diff --git a/manifests/agents/l2gw.pp b/manifests/agents/l2gw.pp index 406ceb052..45a490fd2 100644 --- a/manifests/agents/l2gw.pp +++ b/manifests/agents/l2gw.pp @@ -83,7 +83,7 @@ class neutron::agents::l2gw ( $periodic_interval = $facts['os_service_default'], $max_connection_retries = $facts['os_service_default'], $socket_timeout = '30', - $purge_config = false, + Boolean $purge_config = false, ) { include neutron::deps diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp index e1ce1e5ab..353c7375d 100644 --- a/manifests/agents/l3.pp +++ b/manifests/agents/l3.pp @@ -138,7 +138,7 @@ class neutron::agents::l3 ( $ha_vrrp_auth_password = $facts['os_service_default'], $ha_vrrp_advert_int = '3', $agent_mode = 'legacy', - $purge_config = false, + Boolean $purge_config = false, $availability_zone = $facts['os_service_default'], $extensions = $facts['os_service_default'], $report_interval = $facts['os_service_default'], diff --git a/manifests/agents/metadata.pp b/manifests/agents/metadata.pp index cf9d30b89..b412c40fe 100644 --- a/manifests/agents/metadata.pp +++ b/manifests/agents/metadata.pp @@ -91,7 +91,7 @@ class neutron::agents::metadata ( $nova_client_priv_key = $facts['os_service_default'], $report_interval = $facts['os_service_default'], $rpc_response_max_timeout = $facts['os_service_default'], - $purge_config = false, + Boolean $purge_config = false, ) { include neutron::deps diff --git a/manifests/agents/metering.pp b/manifests/agents/metering.pp index 5b5840272..8d3600811 100644 --- a/manifests/agents/metering.pp +++ b/manifests/agents/metering.pp @@ -76,7 +76,7 @@ class neutron::agents::metering ( $report_interval = $facts['os_service_default'], $rpc_response_max_timeout = $facts['os_service_default'], $agent_report_interval = $facts['os_service_default'], - $purge_config = false, + Boolean $purge_config = false, ) { include neutron::deps diff --git a/manifests/agents/ml2/linuxbridge.pp b/manifests/agents/ml2/linuxbridge.pp index ca0da36d1..e3ce7719e 100644 --- a/manifests/agents/ml2/linuxbridge.pp +++ b/manifests/agents/ml2/linuxbridge.pp @@ -87,7 +87,7 @@ class neutron::agents::ml2::linuxbridge ( Array $physical_interface_mappings = [], Array $bridge_mappings = [], $firewall_driver = 'iptables', - $purge_config = false, + Boolean $purge_config = false, ) { include neutron::deps diff --git a/manifests/agents/ml2/macvtap.pp b/manifests/agents/ml2/macvtap.pp index 1945d0d69..c75499267 100644 --- a/manifests/agents/ml2/macvtap.pp +++ b/manifests/agents/ml2/macvtap.pp @@ -37,7 +37,7 @@ class neutron::agents::ml2::macvtap ( Boolean $manage_service = true, $polling_interval = $facts['os_service_default'], Array $physical_interface_mappings = [], - $purge_config = false, + Boolean $purge_config = false, ) { include neutron::deps diff --git a/manifests/agents/ml2/networking_baremetal.pp b/manifests/agents/ml2/networking_baremetal.pp index 89214ee2d..366d43d52 100644 --- a/manifests/agents/ml2/networking_baremetal.pp +++ b/manifests/agents/ml2/networking_baremetal.pp @@ -121,7 +121,7 @@ class neutron::agents::ml2::networking_baremetal ( $status_code_retry_delay = $facts['os_service_default'], $status_code_retries = $facts['os_service_default'], $valid_interfaces = $facts['os_service_default'], - $purge_config = false, + Boolean $purge_config = false, $report_interval = $facts['os_service_default'], ) { diff --git a/manifests/agents/ml2/ovn.pp b/manifests/agents/ml2/ovn.pp index 14f75f7a4..2a5522458 100644 --- a/manifests/agents/ml2/ovn.pp +++ b/manifests/agents/ml2/ovn.pp @@ -122,7 +122,7 @@ class neutron::agents::ml2::ovn ( $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', $root_helper_daemon = $facts['os_service_default'], $state_path = '/var/lib/neutron', - $purge_config = false, + Boolean $purge_config = false, ) { include neutron::deps diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp index 341d5de15..cdca61235 100644 --- a/manifests/agents/ml2/ovs.pp +++ b/manifests/agents/ml2/ovs.pp @@ -290,7 +290,7 @@ class neutron::agents::ml2::ovs ( $tun_peer_patch_port = $facts['os_service_default'], $datapath_type = $facts['os_service_default'], $vhostuser_socket_dir = $facts['os_service_default'], - $purge_config = false, + Boolean $purge_config = false, Boolean $enable_dpdk = false, $enable_security_group = $facts['os_service_default'], $permitted_ethertypes = $facts['os_service_default'], diff --git a/manifests/agents/ml2/sriov.pp b/manifests/agents/ml2/sriov.pp index e7c9177cc..090992da4 100644 --- a/manifests/agents/ml2/sriov.pp +++ b/manifests/agents/ml2/sriov.pp @@ -107,7 +107,7 @@ class neutron::agents::ml2::sriov ( $report_interval = $facts['os_service_default'], $exclude_devices = $facts['os_service_default'], $extensions = $facts['os_service_default'], - $purge_config = false, + Boolean $purge_config = false, $number_of_vfs = $facts['os_service_default'], $resource_provider_bandwidths = [], $resource_provider_hypervisors = [], diff --git a/manifests/agents/ovn_metadata.pp b/manifests/agents/ovn_metadata.pp index 0433d5dd8..89a4d0c22 100644 --- a/manifests/agents/ovn_metadata.pp +++ b/manifests/agents/ovn_metadata.pp @@ -145,7 +145,7 @@ class neutron::agents::ovn_metadata ( $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', $root_helper_daemon = $facts['os_service_default'], $state_path = '/var/lib/neutron', - $purge_config = false, + Boolean $purge_config = false, ) { include neutron::deps diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp index b2c492203..4ce19bb7b 100644 --- a/manifests/agents/vpnaas.pp +++ b/manifests/agents/vpnaas.pp @@ -44,7 +44,7 @@ class neutron::agents::vpnaas ( $vpn_device_driver = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver', $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', $ipsec_status_check_interval = $facts['os_service_default'], - $purge_config = false, + Boolean $purge_config = false, ) { include neutron::deps diff --git a/manifests/init.pp b/manifests/init.pp index 2ff301d6e..e05d445a7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -369,7 +369,7 @@ class neutron ( $ca_file = $facts['os_service_default'], $state_path = $facts['os_service_default'], $lock_path = '$state_path/lock', - $purge_config = false, + Boolean $purge_config = false, $notification_driver = $facts['os_service_default'], $notification_topics = $facts['os_service_default'], $notification_transport_url = $facts['os_service_default'], diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp index 263823351..3eae8e388 100644 --- a/manifests/plugins/ml2.pp +++ b/manifests/plugins/ml2.pp @@ -137,7 +137,7 @@ class neutron::plugins::ml2 ( $package_ensure = 'present', $physical_network_mtus = $facts['os_service_default'], $path_mtu = 0, - $purge_config = false, + Boolean $purge_config = false, $max_header_size = $facts['os_service_default'], $overlay_ip_version = $facts['os_service_default'], ) { diff --git a/manifests/plugins/ml2/nuage.pp b/manifests/plugins/ml2/nuage.pp index 61fd24c85..425c2f8e0 100644 --- a/manifests/plugins/ml2/nuage.pp +++ b/manifests/plugins/ml2/nuage.pp @@ -53,7 +53,7 @@ class neutron::plugins::ml2::nuage ( $nuage_cms_id, $nuage_auth_resource = '/me', $nuage_server_ssl = true, - $purge_config = false, + Boolean $purge_config = false, $nuage_default_allow_non_ip = false, ) { diff --git a/manifests/policy.pp b/manifests/policy.pp index df7ba6eae..44aa867b7 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -52,7 +52,7 @@ class neutron::policy ( $policy_path = '/etc/neutron/policy.yaml', $policy_default_rule = $facts['os_service_default'], $policy_dirs = $facts['os_service_default'], - $purge_config = false, + Boolean $purge_config = false, ) { include neutron::deps diff --git a/manifests/services/l2gw.pp b/manifests/services/l2gw.pp index 2d40ccc48..bdf5a8942 100644 --- a/manifests/services/l2gw.pp +++ b/manifests/services/l2gw.pp @@ -50,7 +50,7 @@ class neutron::services::l2gw ( $service_providers = $facts['os_service_default'], Boolean $sync_db = false, $package_ensure = 'present', - $purge_config = false, + Boolean $purge_config = false, ) { include neutron::deps