From b3a382f7385836de705c33d01748e00eefebe5bc Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 23 Sep 2025 21:27:01 +0900 Subject: [PATCH] Validate ensure parameter for package resources The minimum version of puppetlabs-stdlib has been bumped globally, so now we can use the common type definition. Change-Id: Ide3c9d927c25721001295faa105835928a95cf9d Signed-off-by: Takashi Kajinami --- manifests/agents/bagpipe.pp | 58 ++++----- manifests/agents/bgp_dragent.pp | 12 +- manifests/agents/dhcp.pp | 58 ++++----- manifests/agents/fwaas.pp | 12 +- manifests/agents/l2gw.pp | 28 ++-- manifests/agents/l3.pp | 2 +- manifests/agents/metadata.pp | 32 ++--- manifests/agents/metering.pp | 22 ++-- manifests/agents/ml2/macvtap.pp | 12 +- manifests/agents/ml2/networking_baremetal.pp | 42 +++--- manifests/agents/ml2/ovn.pp | 46 +++---- manifests/agents/ml2/ovs.pp | 111 ++++++++-------- manifests/agents/ml2/sriov.pp | 30 ++--- manifests/agents/ovn_metadata.pp | 52 ++++---- manifests/agents/taas.pp | 4 +- manifests/agents/vpnaas.pp | 10 +- manifests/agents/vpnaas/ovn.pp | 36 +++--- manifests/client.pp | 2 +- manifests/init.pp | 120 +++++++++--------- manifests/plugins/ml2.pp | 50 ++++---- manifests/plugins/ml2/arista.pp | 2 +- manifests/plugins/ml2/bagpipe.pp | 14 +- manifests/plugins/ml2/networking_baremetal.pp | 2 +- manifests/plugins/ml2/ovn.pp | 86 ++++++------- .../plugins/ml2/ovn/maintenance_worker.pp | 6 +- manifests/server.pp | 88 ++++++------- manifests/services/bgpvpn.pp | 8 +- manifests/services/dr.pp | 6 +- manifests/services/fwaas.pp | 8 +- manifests/services/l2gw.pp | 16 +-- manifests/services/sfc.pp | 14 +- manifests/services/taas.pp | 16 +-- manifests/services/vpnaas.pp | 14 +- 33 files changed, 508 insertions(+), 511 deletions(-) diff --git a/manifests/agents/bagpipe.pp b/manifests/agents/bagpipe.pp index a27859ee3..505158a0e 100644 --- a/manifests/agents/bagpipe.pp +++ b/manifests/agents/bagpipe.pp @@ -21,6 +21,18 @@ # # === Parameters # +# [*package_ensure*] +# (optional) The state of the package +# Defaults to present +# +# [*enabled*] +# (optional) The state of the service +# Defaults to true +# +# [*manage_service*] +# (optional) Whether to start/stop the service +# Defaults to true +# # [*my_as*] # (required) Private Autonomous System number # Defaults to $facts['os_service_default'] @@ -37,18 +49,10 @@ # IP VPN dataplane driver class # Default to ovs # -# [*enabled*] -# (optional) The state of the service -# Defaults to true -# # [*enable_rtc*] # Enable Route Target Constraint # Defaults to $facts['os_service_default'] # -# [*manage_service*] -# (optional) Whether to start/stop the service -# Defaults to true -# # [*mpls_interface*] # MPLS outgoing interface for Linux and OVS drivers # Defaults to $facts['os_service_default'] @@ -57,10 +61,6 @@ # OVS bridge to use # Defaults to $facts['os_service_default'] # -# [*package_ensure*] -# (optional) The state of the package -# Defaults to present -# # [*peers*] # List of peers' IPs to establish p2p connections # Defaults to $facts['os_service_default'] @@ -69,30 +69,30 @@ # For OVS driver control if VRF will reply ARP messages # Defaults to false # +# [*local_address*] +# (required) Local IP of the server to carry BGP traffic +# Defaults to $facts['networking']['ip'] +# # [*purge_config*] # (optional) Whether to set only the specified config options # in the l2gateway config. # Default to false. # -# [*local_address*] -# (required) Local IP of the server to carry BGP traffic -# Defaults to $facts['networking']['ip'] -# class neutron::agents::bagpipe ( $my_as, - $api_host = $facts['os_service_default'], - $api_port = $facts['os_service_default'], - $dataplane_driver_ipvpn = 'ovs', - Boolean $enabled = true, - $enable_rtc = $facts['os_service_default'], - Boolean $manage_service = true, - $mpls_interface = $facts['os_service_default'], - $ovs_bridge = $facts['os_service_default'], - $package_ensure = 'present', - $peers = $facts['os_service_default'], - $proxy_arp = false, - Boolean $purge_config = false, - $local_address = $facts['networking']['ip'], + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $enabled = true, + Boolean $manage_service = true, + $api_host = $facts['os_service_default'], + $api_port = $facts['os_service_default'], + $dataplane_driver_ipvpn = 'ovs', + $enable_rtc = $facts['os_service_default'], + $mpls_interface = $facts['os_service_default'], + $ovs_bridge = $facts['os_service_default'], + $peers = $facts['os_service_default'], + $proxy_arp = false, + $local_address = $facts['networking']['ip'], + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/agents/bgp_dragent.pp b/manifests/agents/bgp_dragent.pp index ecaca605d..694e43f3c 100644 --- a/manifests/agents/bgp_dragent.pp +++ b/manifests/agents/bgp_dragent.pp @@ -46,12 +46,12 @@ # Defaults to false # class neutron::agents::bgp_dragent ( - $package_ensure = 'present', - Boolean $enabled = true, - Boolean $manage_service = true, - $bgp_speaker_driver = 'neutron_dynamic_routing.services.bgp.agent.driver.os_ken.driver.OsKenBgpDriver', - $bgp_router_id = $facts['networking']['ip'], - Boolean $purge_config = false, + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $enabled = true, + Boolean $manage_service = true, + $bgp_speaker_driver = 'neutron_dynamic_routing.services.bgp.agent.driver.os_ken.driver.OsKenBgpDriver', + $bgp_router_id = $facts['networking']['ip'], + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp index b375ad299..56e30d42e 100644 --- a/manifests/agents/dhcp.pp +++ b/manifests/agents/dhcp.pp @@ -131,35 +131,35 @@ # Defaults to $facts['os_service_default'] # class neutron::agents::dhcp ( - $package_ensure = present, - Boolean $enabled = true, - Boolean $manage_service = true, - $debug = $facts['os_service_default'], - $state_path = $facts['os_service_default'], - $resync_interval = $facts['os_service_default'], - $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', - $dhcp_driver = $facts['os_service_default'], - $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', - $dnsmasq_config_file = $facts['os_service_default'], - $dnsmasq_dns_servers = $facts['os_service_default'], - $dnsmasq_base_log_dir = $facts['os_service_default'], - $dnsmasq_local_resolv = $facts['os_service_default'], - $dnsmasq_lease_max = $facts['os_service_default'], - $dnsmasq_enable_addr6_list = $facts['os_service_default'], - Boolean $enable_isolated_metadata = false, - Boolean $enable_force_metadata = false, - Boolean $enable_metadata_network = false, - $dhcp_broadcast_reply = $facts['os_service_default'], - Boolean $purge_config = false, - $availability_zone = $facts['os_service_default'], - $ovs_integration_bridge = $facts['os_service_default'], - $ovsdb_connection = $facts['os_service_default'], - $ovsdb_timeout = $facts['os_service_default'], - $ovsdb_agent_ssl_key_file = $facts['os_service_default'], - $ovsdb_agent_ssl_cert_file = $facts['os_service_default'], - $ovsdb_agent_ssl_ca_file = $facts['os_service_default'], - $report_interval = $facts['os_service_default'], - $rpc_response_max_timeout = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = present, + Boolean $enabled = true, + Boolean $manage_service = true, + $debug = $facts['os_service_default'], + $state_path = $facts['os_service_default'], + $resync_interval = $facts['os_service_default'], + $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', + $dhcp_driver = $facts['os_service_default'], + $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', + $dnsmasq_config_file = $facts['os_service_default'], + $dnsmasq_dns_servers = $facts['os_service_default'], + $dnsmasq_base_log_dir = $facts['os_service_default'], + $dnsmasq_local_resolv = $facts['os_service_default'], + $dnsmasq_lease_max = $facts['os_service_default'], + $dnsmasq_enable_addr6_list = $facts['os_service_default'], + Boolean $enable_isolated_metadata = false, + Boolean $enable_force_metadata = false, + Boolean $enable_metadata_network = false, + $dhcp_broadcast_reply = $facts['os_service_default'], + Boolean $purge_config = false, + $availability_zone = $facts['os_service_default'], + $ovs_integration_bridge = $facts['os_service_default'], + $ovsdb_connection = $facts['os_service_default'], + $ovsdb_timeout = $facts['os_service_default'], + $ovsdb_agent_ssl_key_file = $facts['os_service_default'], + $ovsdb_agent_ssl_cert_file = $facts['os_service_default'], + $ovsdb_agent_ssl_ca_file = $facts['os_service_default'], + $report_interval = $facts['os_service_default'], + $rpc_response_max_timeout = $facts['os_service_default'], ) { include neutron::deps include neutron::params diff --git a/manifests/agents/fwaas.pp b/manifests/agents/fwaas.pp index a12635cd4..149de54b7 100644 --- a/manifests/agents/fwaas.pp +++ b/manifests/agents/fwaas.pp @@ -29,12 +29,12 @@ # Defaults to false. # class neutron::agents::fwaas ( - $package_ensure = present, - $driver = $facts['os_service_default'], - $enabled = $facts['os_service_default'], - $conntrack_driver = $facts['os_service_default'], - $firewall_l2_driver = $facts['os_service_default'], - Boolean $purge_config = false, + Stdlib::Ensure::Package $package_ensure = present, + $driver = $facts['os_service_default'], + $enabled = $facts['os_service_default'], + $conntrack_driver = $facts['os_service_default'], + $firewall_l2_driver = $facts['os_service_default'], + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/agents/l2gw.pp b/manifests/agents/l2gw.pp index 700ae70ea..b556f9462 100644 --- a/manifests/agents/l2gw.pp +++ b/manifests/agents/l2gw.pp @@ -64,20 +64,20 @@ # Default to false. # class neutron::agents::l2gw ( - $package_ensure = 'present', - Boolean $enabled = true, - Boolean $manage_service = true, - $debug = $facts['os_service_default'], - $ovsdb_hosts = $facts['os_service_default'], - $enable_manager = $facts['os_service_default'], - $manager_table_listening_port = $facts['os_service_default'], - $l2_gw_agent_priv_key_base_path = $facts['os_service_default'], - $l2_gw_agent_cert_base_path = $facts['os_service_default'], - $l2_gw_agent_ca_cert_base_path = $facts['os_service_default'], - $periodic_interval = $facts['os_service_default'], - $max_connection_retries = $facts['os_service_default'], - $socket_timeout = $facts['os_service_default'], - Boolean $purge_config = false, + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $enabled = true, + Boolean $manage_service = true, + $debug = $facts['os_service_default'], + $ovsdb_hosts = $facts['os_service_default'], + $enable_manager = $facts['os_service_default'], + $manager_table_listening_port = $facts['os_service_default'], + $l2_gw_agent_priv_key_base_path = $facts['os_service_default'], + $l2_gw_agent_cert_base_path = $facts['os_service_default'], + $l2_gw_agent_ca_cert_base_path = $facts['os_service_default'], + $periodic_interval = $facts['os_service_default'], + $max_connection_retries = $facts['os_service_default'], + $socket_timeout = $facts['os_service_default'], + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp index 4c9874574..d10f8afc3 100644 --- a/manifests/agents/l3.pp +++ b/manifests/agents/l3.pp @@ -178,7 +178,7 @@ # Defaults to false. # class neutron::agents::l3 ( - $package_ensure = 'present', + Stdlib::Ensure::Package $package_ensure = 'present', Boolean $enabled = true, Boolean $manage_service = true, $debug = $facts['os_service_default'], diff --git a/manifests/agents/metadata.pp b/manifests/agents/metadata.pp index 4da23fe64..13fa1506a 100644 --- a/manifests/agents/metadata.pp +++ b/manifests/agents/metadata.pp @@ -78,22 +78,22 @@ # class neutron::agents::metadata ( $shared_secret, - $package_ensure = 'present', - Boolean $enabled = true, - Boolean $manage_service = true, - $debug = $facts['os_service_default'], - $auth_ca_cert = $facts['os_service_default'], - $nova_client_cert = $facts['os_service_default'], - $nova_client_priv_key = $facts['os_service_default'], - $metadata_host = $facts['os_service_default'], - $metadata_port = $facts['os_service_default'], - $metadata_protocol = $facts['os_service_default'], - $metadata_workers = $facts['os_workers'], - $metadata_backlog = $facts['os_service_default'], - $metadata_insecure = $facts['os_service_default'], - $report_interval = $facts['os_service_default'], - $rpc_response_max_timeout = $facts['os_service_default'], - Boolean $purge_config = false, + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $enabled = true, + Boolean $manage_service = true, + $debug = $facts['os_service_default'], + $auth_ca_cert = $facts['os_service_default'], + $nova_client_cert = $facts['os_service_default'], + $nova_client_priv_key = $facts['os_service_default'], + $metadata_host = $facts['os_service_default'], + $metadata_port = $facts['os_service_default'], + $metadata_protocol = $facts['os_service_default'], + $metadata_workers = $facts['os_workers'], + $metadata_backlog = $facts['os_service_default'], + $metadata_insecure = $facts['os_service_default'], + $report_interval = $facts['os_service_default'], + $rpc_response_max_timeout = $facts['os_service_default'], + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/agents/metering.pp b/manifests/agents/metering.pp index 86b61866f..f49fff9cd 100644 --- a/manifests/agents/metering.pp +++ b/manifests/agents/metering.pp @@ -66,17 +66,17 @@ # Defaults to false. # class neutron::agents::metering ( - $package_ensure = present, - Boolean $enabled = true, - Boolean $manage_service = true, - $debug = $facts['os_service_default'], - $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', - $driver = 'neutron.services.metering.drivers.noop.noop_driver.NoopMeteringDriver', - $measure_interval = $facts['os_service_default'], - $report_interval = $facts['os_service_default'], - $rpc_response_max_timeout = $facts['os_service_default'], - $agent_report_interval = $facts['os_service_default'], - Boolean $purge_config = false, + Stdlib::Ensure::Package $package_ensure = present, + Boolean $enabled = true, + Boolean $manage_service = true, + $debug = $facts['os_service_default'], + $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', + $driver = 'neutron.services.metering.drivers.noop.noop_driver.NoopMeteringDriver', + $measure_interval = $facts['os_service_default'], + $report_interval = $facts['os_service_default'], + $rpc_response_max_timeout = $facts['os_service_default'], + $agent_report_interval = $facts['os_service_default'], + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/agents/ml2/macvtap.pp b/manifests/agents/ml2/macvtap.pp index c949d86b3..e81a0a244 100644 --- a/manifests/agents/ml2/macvtap.pp +++ b/manifests/agents/ml2/macvtap.pp @@ -32,12 +32,12 @@ # Defaults to false. # class neutron::agents::ml2::macvtap ( - $package_ensure = 'present', - Boolean $enabled = true, - Boolean $manage_service = true, - $polling_interval = $facts['os_service_default'], - Array $physical_interface_mappings = [], - Boolean $purge_config = false, + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $enabled = true, + Boolean $manage_service = true, + $polling_interval = $facts['os_service_default'], + Array $physical_interface_mappings = [], + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/agents/ml2/networking_baremetal.pp b/manifests/agents/ml2/networking_baremetal.pp index 9f5aa63c7..3f246d98a 100644 --- a/manifests/agents/ml2/networking_baremetal.pp +++ b/manifests/agents/ml2/networking_baremetal.pp @@ -102,27 +102,27 @@ # class neutron::agents::ml2::networking_baremetal ( $password, - Boolean $enabled = true, - Boolean $manage_service = true, - $package_ensure = 'present', - $endpoint_override = $facts['os_service_default'], - $cafile = $facts['os_service_default'], - $certfile = $facts['os_service_default'], - $keyfile = $facts['os_service_default'], - $insecure = $facts['os_service_default'], - $auth_type = 'password', - $auth_url = 'http://127.0.0.1:5000', - $user_domain_name = 'Default', - $username = 'ironic', - $project_domain_name = 'Default', - $project_name = 'services', - $system_scope = $facts['os_service_default'], - $region_name = $facts['os_service_default'], - $status_code_retry_delay = $facts['os_service_default'], - $status_code_retries = $facts['os_service_default'], - $valid_interfaces = $facts['os_service_default'], - Boolean $purge_config = false, - $report_interval = $facts['os_service_default'], + Boolean $enabled = true, + Boolean $manage_service = true, + Stdlib::Ensure::Package $package_ensure = 'present', + $endpoint_override = $facts['os_service_default'], + $cafile = $facts['os_service_default'], + $certfile = $facts['os_service_default'], + $keyfile = $facts['os_service_default'], + $insecure = $facts['os_service_default'], + $auth_type = 'password', + $auth_url = 'http://127.0.0.1:5000', + $user_domain_name = 'Default', + $username = 'ironic', + $project_domain_name = 'Default', + $project_name = 'services', + $system_scope = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $status_code_retry_delay = $facts['os_service_default'], + $status_code_retries = $facts['os_service_default'], + $valid_interfaces = $facts['os_service_default'], + Boolean $purge_config = false, + $report_interval = $facts['os_service_default'], ) { include neutron::deps include neutron::params diff --git a/manifests/agents/ml2/ovn.pp b/manifests/agents/ml2/ovn.pp index e664dbc3b..0a9820644 100644 --- a/manifests/agents/ml2/ovn.pp +++ b/manifests/agents/ml2/ovn.pp @@ -105,29 +105,29 @@ # Defaults to false. # class neutron::agents::ml2::ovn ( - $package_ensure = 'present', - Boolean $enabled = true, - Boolean $manage_service = true, - $debug = $facts['os_service_default'], - $extensions = $facts['os_service_default'], - $ovsdb_connection = 'tcp:127.0.0.1:6640', - $ovs_manager = 'ptcp:6640:127.0.0.1', - $ovn_nb_connection = $facts['os_service_default'], - $ovn_sb_connection = $facts['os_service_default'], - $ovn_nb_private_key = $facts['os_service_default'], - $ovn_nb_certificate = $facts['os_service_default'], - $ovn_nb_ca_cert = $facts['os_service_default'], - $ovn_sb_private_key = $facts['os_service_default'], - $ovn_sb_certificate = $facts['os_service_default'], - $ovn_sb_ca_cert = $facts['os_service_default'], - $ovsdb_connection_timeout = $facts['os_service_default'], - $ovndb_connection_timeout = $facts['os_service_default'], - $ovsdb_retry_max_interval = $facts['os_service_default'], - $ovsdb_probe_interval = $facts['os_service_default'], - $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', - $root_helper_daemon = $facts['os_service_default'], - $state_path = $facts['os_service_default'], - Boolean $purge_config = false, + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $enabled = true, + Boolean $manage_service = true, + $debug = $facts['os_service_default'], + $extensions = $facts['os_service_default'], + $ovsdb_connection = 'tcp:127.0.0.1:6640', + $ovs_manager = 'ptcp:6640:127.0.0.1', + $ovn_nb_connection = $facts['os_service_default'], + $ovn_sb_connection = $facts['os_service_default'], + $ovn_nb_private_key = $facts['os_service_default'], + $ovn_nb_certificate = $facts['os_service_default'], + $ovn_nb_ca_cert = $facts['os_service_default'], + $ovn_sb_private_key = $facts['os_service_default'], + $ovn_sb_certificate = $facts['os_service_default'], + $ovn_sb_ca_cert = $facts['os_service_default'], + $ovsdb_connection_timeout = $facts['os_service_default'], + $ovndb_connection_timeout = $facts['os_service_default'], + $ovsdb_retry_max_interval = $facts['os_service_default'], + $ovsdb_probe_interval = $facts['os_service_default'], + $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', + $root_helper_daemon = $facts['os_service_default'], + $state_path = $facts['os_service_default'], + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp index 66bb60349..1b881125e 100644 --- a/manifests/agents/ml2/ovs.pp +++ b/manifests/agents/ml2/ovs.pp @@ -279,63 +279,60 @@ # Defaults to $facts['os_service_default']. # class neutron::agents::ml2::ovs ( - $package_ensure = 'present', - Boolean $enabled = true, - Boolean $manage_service = true, - $extensions = $facts['os_service_default'], - $bridge_uplinks = [], - $bridge_mappings = [], - $ovsdb_connection = $facts['os_service_default'], - $ovsdb_timeout = $facts['os_service_default'], - $of_listen_address = $facts['os_service_default'], - $of_listen_port = $facts['os_service_default'], - $of_connect_timeout = $facts['os_service_default'], - $of_request_timeout = $facts['os_service_default'], - $of_inactivity_probe = $facts['os_service_default'], - $integration_bridge = $facts['os_service_default'], - Array $tunnel_types = [], - $local_ip = undef, - $tunnel_bridge = $facts['os_service_default'], - $vxlan_udp_port = $facts['os_service_default'], - $polling_interval = $facts['os_service_default'], - $report_interval = $facts['os_service_default'], - $rpc_response_max_timeout = $facts['os_service_default'], - $l2_population = $facts['os_service_default'], - $arp_responder = $facts['os_service_default'], - $firewall_driver = 'iptables_hybrid', - $enable_distributed_routing = $facts['os_service_default'], - $drop_flows_on_start = $facts['os_service_default'], - Boolean $manage_vswitch = true, - $int_peer_patch_port = $facts['os_service_default'], - $tun_peer_patch_port = $facts['os_service_default'], - $datapath_type = $facts['os_service_default'], - $vhostuser_socket_dir = $facts['os_service_default'], - Boolean $purge_config = false, - Boolean $enable_dpdk = false, - $enable_security_group = $facts['os_service_default'], - $permitted_ethertypes = $facts['os_service_default'], - $minimize_polling = $facts['os_service_default'], - $tunnel_csum = $facts['os_service_default'], - $bridge_mac_table_size = $facts['os_service_default'], - $igmp_snooping_enable = $facts['os_service_default'], - $igmp_flood = $facts['os_service_default'], - $igmp_flood_reports = $facts['os_service_default'], - $igmp_flood_unregistered = $facts['os_service_default'], - $resource_provider_bandwidths = [], - $resource_provider_packet_processing_without_direction - = [], - $resource_provider_packet_processing_with_direction - = [], - $resource_provider_hypervisors = [], - $resource_provider_default_hypervisor = $facts['os_service_default'], - $resource_provider_inventory_defaults = {}, - $resource_provider_packet_processing_inventory_defaults - = {}, - $explicitly_egress_direct = $facts['os_service_default'], - $network_log_rate_limit = $facts['os_service_default'], - $network_log_burst_limit = $facts['os_service_default'], - $network_log_local_output_log_base = $facts['os_service_default'], - $openflow_processed_per_port = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $enabled = true, + Boolean $manage_service = true, + $extensions = $facts['os_service_default'], + $bridge_uplinks = [], + $bridge_mappings = [], + $ovsdb_connection = $facts['os_service_default'], + $ovsdb_timeout = $facts['os_service_default'], + $of_listen_address = $facts['os_service_default'], + $of_listen_port = $facts['os_service_default'], + $of_connect_timeout = $facts['os_service_default'], + $of_request_timeout = $facts['os_service_default'], + $of_inactivity_probe = $facts['os_service_default'], + $integration_bridge = $facts['os_service_default'], + Array $tunnel_types = [], + $local_ip = undef, + $tunnel_bridge = $facts['os_service_default'], + $vxlan_udp_port = $facts['os_service_default'], + $polling_interval = $facts['os_service_default'], + $report_interval = $facts['os_service_default'], + $rpc_response_max_timeout = $facts['os_service_default'], + $l2_population = $facts['os_service_default'], + $arp_responder = $facts['os_service_default'], + $firewall_driver = 'iptables_hybrid', + $enable_distributed_routing = $facts['os_service_default'], + $drop_flows_on_start = $facts['os_service_default'], + Boolean $manage_vswitch = true, + $int_peer_patch_port = $facts['os_service_default'], + $tun_peer_patch_port = $facts['os_service_default'], + $datapath_type = $facts['os_service_default'], + $vhostuser_socket_dir = $facts['os_service_default'], + Boolean $purge_config = false, + Boolean $enable_dpdk = false, + $enable_security_group = $facts['os_service_default'], + $permitted_ethertypes = $facts['os_service_default'], + $minimize_polling = $facts['os_service_default'], + $tunnel_csum = $facts['os_service_default'], + $bridge_mac_table_size = $facts['os_service_default'], + $igmp_snooping_enable = $facts['os_service_default'], + $igmp_flood = $facts['os_service_default'], + $igmp_flood_reports = $facts['os_service_default'], + $igmp_flood_unregistered = $facts['os_service_default'], + $resource_provider_bandwidths = [], + $resource_provider_packet_processing_without_direction = [], + $resource_provider_packet_processing_with_direction = [], + $resource_provider_hypervisors = [], + $resource_provider_default_hypervisor = $facts['os_service_default'], + $resource_provider_inventory_defaults = {}, + $resource_provider_packet_processing_inventory_defaults = {}, + $explicitly_egress_direct = $facts['os_service_default'], + $network_log_rate_limit = $facts['os_service_default'], + $network_log_burst_limit = $facts['os_service_default'], + $network_log_local_output_log_base = $facts['os_service_default'], + $openflow_processed_per_port = $facts['os_service_default'], ) { include neutron::deps include neutron::params diff --git a/manifests/agents/ml2/sriov.pp b/manifests/agents/ml2/sriov.pp index 60c142548..57eeaa553 100644 --- a/manifests/agents/ml2/sriov.pp +++ b/manifests/agents/ml2/sriov.pp @@ -98,21 +98,21 @@ # Defaults to empty hash # class neutron::agents::ml2::sriov ( - $package_ensure = 'present', - Boolean $enabled = true, - Boolean $manage_service = true, - $physical_device_mappings = $facts['os_service_default'], - $rpc_response_max_timeout = $facts['os_service_default'], - $polling_interval = 2, - $report_interval = $facts['os_service_default'], - $exclude_devices = $facts['os_service_default'], - $extensions = $facts['os_service_default'], - Boolean $purge_config = false, - $number_of_vfs = $facts['os_service_default'], - $resource_provider_bandwidths = [], - $resource_provider_hypervisors = [], - $resource_provider_default_hypervisor = $facts['os_service_default'], - $resource_provider_inventory_defaults = {}, + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $enabled = true, + Boolean $manage_service = true, + $physical_device_mappings = $facts['os_service_default'], + $rpc_response_max_timeout = $facts['os_service_default'], + $polling_interval = 2, + $report_interval = $facts['os_service_default'], + $exclude_devices = $facts['os_service_default'], + $extensions = $facts['os_service_default'], + Boolean $purge_config = false, + $number_of_vfs = $facts['os_service_default'], + $resource_provider_bandwidths = [], + $resource_provider_hypervisors = [], + $resource_provider_default_hypervisor = $facts['os_service_default'], + $resource_provider_inventory_defaults = {}, ) { include neutron::deps include neutron::params diff --git a/manifests/agents/ovn_metadata.pp b/manifests/agents/ovn_metadata.pp index 27588bc08..31a72e825 100644 --- a/manifests/agents/ovn_metadata.pp +++ b/manifests/agents/ovn_metadata.pp @@ -122,32 +122,32 @@ # class neutron::agents::ovn_metadata ( $shared_secret, - $package_ensure = 'present', - Boolean $enabled = true, - Boolean $manage_service = true, - $debug = $facts['os_service_default'], - $auth_ca_cert = $facts['os_service_default'], - $metadata_host = $facts['os_service_default'], - $metadata_port = $facts['os_service_default'], - $metadata_protocol = $facts['os_service_default'], - $metadata_workers = $facts['os_service_default'], - $metadata_backlog = $facts['os_service_default'], - $metadata_insecure = $facts['os_service_default'], - $nova_client_cert = $facts['os_service_default'], - $nova_client_priv_key = $facts['os_service_default'], - $ovsdb_connection = 'tcp:127.0.0.1:6640', - $ovs_manager = 'ptcp:6640:127.0.0.1', - $ovn_sb_connection = $facts['os_service_default'], - $ovn_sb_private_key = $facts['os_service_default'], - $ovn_sb_certificate = $facts['os_service_default'], - $ovn_sb_ca_cert = $facts['os_service_default'], - $ovsdb_connection_timeout = $facts['os_service_default'], - $ovsdb_retry_max_interval = $facts['os_service_default'], - $ovsdb_probe_interval = $facts['os_service_default'], - $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', - $root_helper_daemon = $facts['os_service_default'], - $state_path = $facts['os_service_default'], - Boolean $purge_config = false, + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $enabled = true, + Boolean $manage_service = true, + $debug = $facts['os_service_default'], + $auth_ca_cert = $facts['os_service_default'], + $metadata_host = $facts['os_service_default'], + $metadata_port = $facts['os_service_default'], + $metadata_protocol = $facts['os_service_default'], + $metadata_workers = $facts['os_service_default'], + $metadata_backlog = $facts['os_service_default'], + $metadata_insecure = $facts['os_service_default'], + $nova_client_cert = $facts['os_service_default'], + $nova_client_priv_key = $facts['os_service_default'], + $ovsdb_connection = 'tcp:127.0.0.1:6640', + $ovs_manager = 'ptcp:6640:127.0.0.1', + $ovn_sb_connection = $facts['os_service_default'], + $ovn_sb_private_key = $facts['os_service_default'], + $ovn_sb_certificate = $facts['os_service_default'], + $ovn_sb_ca_cert = $facts['os_service_default'], + $ovsdb_connection_timeout = $facts['os_service_default'], + $ovsdb_retry_max_interval = $facts['os_service_default'], + $ovsdb_probe_interval = $facts['os_service_default'], + $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', + $root_helper_daemon = $facts['os_service_default'], + $state_path = $facts['os_service_default'], + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/agents/taas.pp b/manifests/agents/taas.pp index 61cd6794a..376e1c60a 100644 --- a/manifests/agents/taas.pp +++ b/manifests/agents/taas.pp @@ -24,8 +24,8 @@ # Defaults to $facts['os_service_default']. # class neutron::agents::taas ( - $package_ensure = present, - $taas_agent_periodic_interval = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = present, + $taas_agent_periodic_interval = $facts['os_service_default'], ) { include neutron::deps include neutron::params diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp index ef2eb5d97..2068ff413 100644 --- a/manifests/agents/vpnaas.pp +++ b/manifests/agents/vpnaas.pp @@ -41,11 +41,11 @@ # Defaults to false. # class neutron::agents::vpnaas ( - $package_ensure = present, - $vpn_device_driver = 'neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver', - $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', - $ipsec_status_check_interval = $facts['os_service_default'], - Boolean $purge_config = false, + Stdlib::Ensure::Package $package_ensure = present, + $vpn_device_driver = 'neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver', + $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', + $ipsec_status_check_interval = $facts['os_service_default'], + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/agents/vpnaas/ovn.pp b/manifests/agents/vpnaas/ovn.pp index 3699c913d..57880f5c9 100644 --- a/manifests/agents/vpnaas/ovn.pp +++ b/manifests/agents/vpnaas/ovn.pp @@ -79,24 +79,24 @@ # Defaults to $facts['os_service_default']. # class neutron::agents::vpnaas::ovn ( - $package_ensure = present, - Boolean $enabled = true, - Boolean $manage_service = true, - $debug = $facts['os_service_default'], - $vpn_device_driver = 'neutron_vpnaas.services.vpn.device_drivers.ovn_ipsec.OvnOpenSwanDriver', - $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', - $ipsec_status_check_interval = $facts['os_service_default'], - $ovsdb_connection = 'tcp:127.0.0.1:6640', - $ovs_manager = 'ptcp:6640:127.0.0.1', - $ovn_sb_connection = $facts['os_service_default'], - $ovn_sb_private_key = $facts['os_service_default'], - $ovn_sb_certificate = $facts['os_service_default'], - $ovn_sb_ca_cert = $facts['os_service_default'], - $ovsdb_connection_timeout = $facts['os_service_default'], - $ovndb_connection_timeout = $facts['os_service_default'], - $ovsdb_retry_max_interval = $facts['os_service_default'], - $ovsdb_probe_interval = $facts['os_service_default'], - Boolean $purge_config = false, + Stdlib::Ensure::Package $package_ensure = present, + Boolean $enabled = true, + Boolean $manage_service = true, + $debug = $facts['os_service_default'], + $vpn_device_driver = 'neutron_vpnaas.services.vpn.device_drivers.ovn_ipsec.OvnOpenSwanDriver', + $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', + $ipsec_status_check_interval = $facts['os_service_default'], + $ovsdb_connection = 'tcp:127.0.0.1:6640', + $ovs_manager = 'ptcp:6640:127.0.0.1', + $ovn_sb_connection = $facts['os_service_default'], + $ovn_sb_private_key = $facts['os_service_default'], + $ovn_sb_certificate = $facts['os_service_default'], + $ovn_sb_ca_cert = $facts['os_service_default'], + $ovsdb_connection_timeout = $facts['os_service_default'], + $ovndb_connection_timeout = $facts['os_service_default'], + $ovsdb_retry_max_interval = $facts['os_service_default'], + $ovsdb_probe_interval = $facts['os_service_default'], + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/client.pp b/manifests/client.pp index 89ed50b86..10861173f 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -9,7 +9,7 @@ # Defaults to present # class neutron::client ( - $package_ensure = present + Stdlib::Ensure::Package $package_ensure = present ) { include neutron::deps include neutron::params diff --git a/manifests/init.pp b/manifests/init.pp index 374895923..e91fd95dd 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -292,67 +292,67 @@ # Defaults to undef. # class neutron ( - $package_ensure = 'present', - $bind_host = $facts['os_service_default'], - $bind_port = $facts['os_service_default'], - $core_plugin = 'ml2', - $service_plugins = $facts['os_service_default'], - $auth_strategy = 'keystone', - $base_mac = $facts['os_service_default'], - $dhcp_lease_duration = $facts['os_service_default'], - $host = $facts['os_service_default'], - $dns_domain = $facts['os_service_default'], - $dhcp_agents_per_network = $facts['os_service_default'], - $global_physnet_mtu = $facts['os_service_default'], - $dhcp_agent_notification = $facts['os_service_default'], - $allow_bulk = $facts['os_service_default'], - $api_extensions_path = $facts['os_service_default'], - $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', - $root_helper_daemon = $facts['os_service_default'], - $report_interval = $facts['os_service_default'], - $control_exchange = $facts['os_service_default'], - $executor_thread_pool_size = $facts['os_service_default'], - $default_transport_url = $facts['os_service_default'], - $rpc_response_timeout = $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_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'], - $rabbit_transient_queues_ttl = $facts['os_service_default'], - $amqp_durable_queues = $facts['os_service_default'], - $amqp_auto_delete = $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_missing_consumer_retry_timeout = $facts['os_service_default'], - $kombu_failover_strategy = $facts['os_service_default'], - $kombu_compression = $facts['os_service_default'], - $use_ssl = $facts['os_service_default'], - $cert_file = $facts['os_service_default'], - $key_file = $facts['os_service_default'], - $ca_file = $facts['os_service_default'], - $state_path = $facts['os_service_default'], - $lock_path = '$state_path/lock', - 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'], - $max_allowed_address_pair = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', + $bind_host = $facts['os_service_default'], + $bind_port = $facts['os_service_default'], + $core_plugin = 'ml2', + $service_plugins = $facts['os_service_default'], + $auth_strategy = 'keystone', + $base_mac = $facts['os_service_default'], + $dhcp_lease_duration = $facts['os_service_default'], + $host = $facts['os_service_default'], + $dns_domain = $facts['os_service_default'], + $dhcp_agents_per_network = $facts['os_service_default'], + $global_physnet_mtu = $facts['os_service_default'], + $dhcp_agent_notification = $facts['os_service_default'], + $allow_bulk = $facts['os_service_default'], + $api_extensions_path = $facts['os_service_default'], + $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', + $root_helper_daemon = $facts['os_service_default'], + $report_interval = $facts['os_service_default'], + $control_exchange = $facts['os_service_default'], + $executor_thread_pool_size = $facts['os_service_default'], + $default_transport_url = $facts['os_service_default'], + $rpc_response_timeout = $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_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'], + $rabbit_transient_queues_ttl = $facts['os_service_default'], + $amqp_durable_queues = $facts['os_service_default'], + $amqp_auto_delete = $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_missing_consumer_retry_timeout = $facts['os_service_default'], + $kombu_failover_strategy = $facts['os_service_default'], + $kombu_compression = $facts['os_service_default'], + $use_ssl = $facts['os_service_default'], + $cert_file = $facts['os_service_default'], + $key_file = $facts['os_service_default'], + $ca_file = $facts['os_service_default'], + $state_path = $facts['os_service_default'], + $lock_path = '$state_path/lock', + 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'], + $max_allowed_address_pair = $facts['os_service_default'], # DEPRECATED PARAMETERS - $vlan_transparent = undef, - $vlan_qinq = undef, + $vlan_transparent = undef, + $vlan_qinq = undef, ) { include neutron::deps include neutron::params diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp index 27cef7330..4376c13bb 100644 --- a/manifests/plugins/ml2.pp +++ b/manifests/plugins/ml2.pp @@ -22,6 +22,10 @@ # # === Parameters # +# [*package_ensure*] +# (optional) Ensure state for package. +# Defaults to 'present'. +# # [*type_drivers*] # (optional) List of network type driver entrypoints to be loaded # from the neutron.ml2.type_drivers namespace. @@ -92,10 +96,6 @@ # It should be false when you use nova security group. # Defaults to $facts['os_service_default']. # -# [*package_ensure*] -# (optional) Ensure state for package. -# Defaults to 'present'. -# # [*physical_network_mtus*] # (optional) For L2 mechanism drivers, per-physical network MTU setting. # Should be an array with 'physnetX1:9000'. @@ -107,11 +107,6 @@ # encapsulated traffic is sent. # Defaults to $facts['os_service_default']. # -# [*purge_config*] -# (optional) Whether to set only the specified config options -# in the ml2 config. -# Defaults to false. -# # [*max_header_size*] # (optional) Geneve encapsulation header size is dynamic, this value is used to calculate # the maximum MTU for the driver. @@ -122,23 +117,28 @@ # are 4 and 6. # Defaults to $facts['os_service_default'] # +# [*purge_config*] +# (optional) Whether to set only the specified config options +# in the ml2 config. +# Defaults to false. +# class neutron::plugins::ml2 ( - $type_drivers = ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'], - $extension_drivers = $facts['os_service_default'], - $tenant_network_types = ['local', 'flat', 'vlan', 'gre', 'vxlan'], - $mechanism_drivers = ['openvswitch'], - $flat_networks = '*', - $network_vlan_ranges = 'physnet1:1000:2999', - $tunnel_id_ranges = '20:100', - $vxlan_group = '224.0.0.1', - $vni_ranges = '10:100', - $enable_security_group = $facts['os_service_default'], - $package_ensure = 'present', - $physical_network_mtus = $facts['os_service_default'], - $path_mtu = $facts['os_service_default'], - Boolean $purge_config = false, - $max_header_size = $facts['os_service_default'], - $overlay_ip_version = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', + $type_drivers = ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'], + $extension_drivers = $facts['os_service_default'], + $tenant_network_types = ['local', 'flat', 'vlan', 'gre', 'vxlan'], + $mechanism_drivers = ['openvswitch'], + $flat_networks = '*', + $network_vlan_ranges = 'physnet1:1000:2999', + $tunnel_id_ranges = '20:100', + $vxlan_group = '224.0.0.1', + $vni_ranges = '10:100', + $enable_security_group = $facts['os_service_default'], + $physical_network_mtus = $facts['os_service_default'], + $path_mtu = $facts['os_service_default'], + $max_header_size = $facts['os_service_default'], + $overlay_ip_version = $facts['os_service_default'], + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/plugins/ml2/arista.pp b/manifests/plugins/ml2/arista.pp index 9447fdb4d..bdc903fe1 100644 --- a/manifests/plugins/ml2/arista.pp +++ b/manifests/plugins/ml2/arista.pp @@ -60,7 +60,7 @@ class neutron::plugins::ml2::arista ( $sync_interval = $facts['os_service_default'], $conn_timeout = $facts['os_service_default'], $use_fqdn = $facts['os_service_default'], - $package_ensure = 'present' + Stdlib::Ensure::Package $package_ensure = 'present' ) { include neutron::deps include neutron::params diff --git a/manifests/plugins/ml2/bagpipe.pp b/manifests/plugins/ml2/bagpipe.pp index a2c9f81fd..dea693017 100644 --- a/manifests/plugins/ml2/bagpipe.pp +++ b/manifests/plugins/ml2/bagpipe.pp @@ -21,6 +21,10 @@ # # === Parameters # +# [*package_ensure*] +# (optional) The state of the package +# Defaults to present +# # [*bagpipe_bgp_port*] # BGP component API port # Defaults to $facts['os_service_default'] @@ -29,14 +33,10 @@ # OVS bridge to use # Defaults to $facts['os_service_default'] # -# [*package_ensure*] -# (optional) The state of the package -# Defaults to present -# class neutron::plugins::ml2::bagpipe ( - $bagpipe_bgp_port = $facts['os_service_default'], - $mpls_bridge = $facts['os_service_default'], - $package_ensure = 'present', + Stdlib::Ensure::Package $package_ensure = 'present', + $bagpipe_bgp_port = $facts['os_service_default'], + $mpls_bridge = $facts['os_service_default'], ) { include neutron::deps include neutron::params diff --git a/manifests/plugins/ml2/networking_baremetal.pp b/manifests/plugins/ml2/networking_baremetal.pp index 7969fbdb5..e7035bf55 100644 --- a/manifests/plugins/ml2/networking_baremetal.pp +++ b/manifests/plugins/ml2/networking_baremetal.pp @@ -11,7 +11,7 @@ # Defaults to 'present' # class neutron::plugins::ml2::networking_baremetal ( - $package_ensure = 'present', + Stdlib::Ensure::Package $package_ensure = 'present', ) { include neutron::deps include neutron::params diff --git a/manifests/plugins/ml2/ovn.pp b/manifests/plugins/ml2/ovn.pp index 50f094238..8a77658a6 100644 --- a/manifests/plugins/ml2/ovn.pp +++ b/manifests/plugins/ml2/ovn.pp @@ -2,6 +2,12 @@ # # === Parameters # +# [*package_ensure*] +# (optional) The intended state of the python-networking-odl +# package, i.e. any of the possible values of the 'ensure' +# property for a package resource type. +# Defaults to 'present' +# # [*ovn_nb_connection*] # (optional) The connection string for the OVN_Northbound OVSDB. # Defaults to $facts['os_service_default'] @@ -38,12 +44,6 @@ # verify certificates presented to it by SSL peers # Defaults to $facts['os_service_default'] # -# [*package_ensure*] -# (optional) The intended state of the python-networking-odl -# package, i.e. any of the possible values of the 'ensure' -# property for a package resource type. -# Defaults to 'present' -# # [*ovsdb_connection_timeout*] # (optional) Timeout in seconds for the OVSDB connection transaction # Defaults to $facts['os_service_default'] @@ -198,44 +198,44 @@ # Defaults to $facts['os_service_default'] # class neutron::plugins::ml2::ovn ( - $ovn_nb_connection = $facts['os_service_default'], - $ovn_sb_connection = $facts['os_service_default'], - $ovn_nb_private_key = $facts['os_service_default'], - $ovn_nb_certificate = $facts['os_service_default'], - $ovn_nb_ca_cert = $facts['os_service_default'], - $ovn_sb_private_key = $facts['os_service_default'], - $ovn_sb_certificate = $facts['os_service_default'], - $ovn_sb_ca_cert = $facts['os_service_default'], - $package_ensure = 'present', - $ovsdb_connection_timeout = $facts['os_service_default'], - $ovsdb_retry_max_interval = $facts['os_service_default'], - $ovsdb_probe_interval = $facts['os_service_default'], - $neutron_sync_mode = $facts['os_service_default'], - $ovn_l3_scheduler = $facts['os_service_default'], - $ovn_metadata_enabled = $facts['os_service_default'], - $dvr_enabled = $facts['os_service_default'], - $disable_ovn_dhcp_for_baremetal_ports = $facts['os_service_default'], - $dns_servers = $facts['os_service_default'], - $dns_records_ovn_owned = $facts['os_service_default'], - $vhostuser_socket_dir = $facts['os_service_default'], - $dhcp_default_lease_time = $facts['os_service_default'], - $ovn_dhcp4_global_options = $facts['os_service_default'], - $ovn_dhcp6_global_options = $facts['os_service_default'], - $localnet_learn_fdb = $facts['os_service_default'], - $fdb_age_threshold = $facts['os_service_default'], - $mac_binding_age_threshold = $facts['os_service_default'], - $broadcast_arps_to_all_routers = $facts['os_service_default'], - $ovn_router_indirect_snat = $facts['os_service_default'], - $live_migration_activation_strategy = $facts['os_service_default'], - $stateless_nat_enabled = $facts['os_service_default'], - $ignore_lsp_down = $facts['os_service_default'], - $fdb_removal_limit = $facts['os_service_default'], - $mac_binding_removal_limit = $facts['os_service_default'], - $network_log_rate_limit = $facts['os_service_default'], - $network_log_burst_limit = $facts['os_service_default'], - $network_log_local_output_log_base = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', + $ovn_nb_connection = $facts['os_service_default'], + $ovn_sb_connection = $facts['os_service_default'], + $ovn_nb_private_key = $facts['os_service_default'], + $ovn_nb_certificate = $facts['os_service_default'], + $ovn_nb_ca_cert = $facts['os_service_default'], + $ovn_sb_private_key = $facts['os_service_default'], + $ovn_sb_certificate = $facts['os_service_default'], + $ovn_sb_ca_cert = $facts['os_service_default'], + $ovsdb_connection_timeout = $facts['os_service_default'], + $ovsdb_retry_max_interval = $facts['os_service_default'], + $ovsdb_probe_interval = $facts['os_service_default'], + $neutron_sync_mode = $facts['os_service_default'], + $ovn_l3_scheduler = $facts['os_service_default'], + $ovn_metadata_enabled = $facts['os_service_default'], + $dvr_enabled = $facts['os_service_default'], + $disable_ovn_dhcp_for_baremetal_ports = $facts['os_service_default'], + $dns_servers = $facts['os_service_default'], + $dns_records_ovn_owned = $facts['os_service_default'], + $vhostuser_socket_dir = $facts['os_service_default'], + $dhcp_default_lease_time = $facts['os_service_default'], + $ovn_dhcp4_global_options = $facts['os_service_default'], + $ovn_dhcp6_global_options = $facts['os_service_default'], + $localnet_learn_fdb = $facts['os_service_default'], + $fdb_age_threshold = $facts['os_service_default'], + $mac_binding_age_threshold = $facts['os_service_default'], + $broadcast_arps_to_all_routers = $facts['os_service_default'], + $ovn_router_indirect_snat = $facts['os_service_default'], + $live_migration_activation_strategy = $facts['os_service_default'], + $stateless_nat_enabled = $facts['os_service_default'], + $ignore_lsp_down = $facts['os_service_default'], + $fdb_removal_limit = $facts['os_service_default'], + $mac_binding_removal_limit = $facts['os_service_default'], + $network_log_rate_limit = $facts['os_service_default'], + $network_log_burst_limit = $facts['os_service_default'], + $network_log_local_output_log_base = $facts['os_service_default'], # DEPRECATED PARAMETERS - $ovn_emit_need_to_frag = undef, + $ovn_emit_need_to_frag = undef, ) { include neutron::deps diff --git a/manifests/plugins/ml2/ovn/maintenance_worker.pp b/manifests/plugins/ml2/ovn/maintenance_worker.pp index f2883096c..e03a5c5ce 100644 --- a/manifests/plugins/ml2/ovn/maintenance_worker.pp +++ b/manifests/plugins/ml2/ovn/maintenance_worker.pp @@ -15,9 +15,9 @@ # Defaults to true # class neutron::plugins::ml2::ovn::maintenance_worker ( - $package_ensure = 'present', - Boolean $enabled = true, - Boolean $manage_service = true, + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $enabled = true, + Boolean $manage_service = true, ) { include neutron::params diff --git a/manifests/server.pp b/manifests/server.pp index f6c42b16e..c42bde727 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -236,51 +236,51 @@ # Defaults to undef # class neutron::server ( - $package_ensure = 'present', - Boolean $enabled = true, - Boolean $manage_service = true, - $api_package_name = $neutron::params::api_package_name, - $api_service_name = $neutron::params::api_service_name, - $rpc_package_name = $neutron::params::rpc_package_name, - $rpc_service_name = $neutron::params::rpc_service_name, - $periodic_workers_package_name = $neutron::params::periodic_workers_package_name, - $periodic_workers_service_name = $neutron::params::periodic_workers_service_name, - Boolean $sync_db = false, - $api_workers = $facts['os_workers'], - $rpc_workers = $facts['os_workers'], - $rpc_state_report_workers = $facts['os_service_default'], - $rpc_response_max_timeout = $facts['os_service_default'], - $agent_down_time = $facts['os_service_default'], - $enable_new_agents = $facts['os_service_default'], - $network_scheduler_driver = $facts['os_service_default'], - $router_scheduler_driver = $facts['os_service_default'], - $router_distributed = $facts['os_service_default'], - $enable_dvr = $facts['os_service_default'], - $dhcp_load_type = $facts['os_service_default'], - $default_availability_zones = $facts['os_service_default'], - $allow_automatic_l3agent_failover = $facts['os_service_default'], - $allow_automatic_dhcp_failover = $facts['os_service_default'], - $l3_ha = $facts['os_service_default'], - $max_l3_agents_per_router = $facts['os_service_default'], - $l3_ha_net_cidr = $facts['os_service_default'], - $l3_ha_network_type = $facts['os_service_default'], - $l3_ha_network_physical_name = $facts['os_service_default'], - $network_auto_schedule = $facts['os_service_default'], - $service_providers = $facts['os_service_default'], - $auth_strategy = 'keystone', - $enable_proxy_headers_parsing = $facts['os_service_default'], - $max_request_body_size = $facts['os_service_default'], - $pagination_max_limit = $facts['os_service_default'], - $ovs_integration_bridge = $facts['os_service_default'], - $igmp_snooping_enable = $facts['os_service_default'], - $igmp_flood = $facts['os_service_default'], - $igmp_flood_reports = $facts['os_service_default'], - $igmp_flood_unregistered = $facts['os_service_default'], - $enable_default_route_ecmp = $facts['os_service_default'], - $enable_default_route_bfd = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $enabled = true, + Boolean $manage_service = true, + $api_package_name = $neutron::params::api_package_name, + $api_service_name = $neutron::params::api_service_name, + $rpc_package_name = $neutron::params::rpc_package_name, + $rpc_service_name = $neutron::params::rpc_service_name, + $periodic_workers_package_name = $neutron::params::periodic_workers_package_name, + $periodic_workers_service_name = $neutron::params::periodic_workers_service_name, + Boolean $sync_db = false, + $api_workers = $facts['os_workers'], + $rpc_workers = $facts['os_workers'], + $rpc_state_report_workers = $facts['os_service_default'], + $rpc_response_max_timeout = $facts['os_service_default'], + $agent_down_time = $facts['os_service_default'], + $enable_new_agents = $facts['os_service_default'], + $network_scheduler_driver = $facts['os_service_default'], + $router_scheduler_driver = $facts['os_service_default'], + $router_distributed = $facts['os_service_default'], + $enable_dvr = $facts['os_service_default'], + $dhcp_load_type = $facts['os_service_default'], + $default_availability_zones = $facts['os_service_default'], + $allow_automatic_l3agent_failover = $facts['os_service_default'], + $allow_automatic_dhcp_failover = $facts['os_service_default'], + $l3_ha = $facts['os_service_default'], + $max_l3_agents_per_router = $facts['os_service_default'], + $l3_ha_net_cidr = $facts['os_service_default'], + $l3_ha_network_type = $facts['os_service_default'], + $l3_ha_network_physical_name = $facts['os_service_default'], + $network_auto_schedule = $facts['os_service_default'], + $service_providers = $facts['os_service_default'], + $auth_strategy = 'keystone', + $enable_proxy_headers_parsing = $facts['os_service_default'], + $max_request_body_size = $facts['os_service_default'], + $pagination_max_limit = $facts['os_service_default'], + $ovs_integration_bridge = $facts['os_service_default'], + $igmp_snooping_enable = $facts['os_service_default'], + $igmp_flood = $facts['os_service_default'], + $igmp_flood_reports = $facts['os_service_default'], + $igmp_flood_unregistered = $facts['os_service_default'], + $enable_default_route_ecmp = $facts['os_service_default'], + $enable_default_route_bfd = $facts['os_service_default'], # DEPRECATED PARMETERS - $service_name = undef, - $server_package = undef, + $service_name = undef, + $server_package = undef, ) inherits neutron::params { include neutron::deps include neutron::db diff --git a/manifests/services/bgpvpn.pp b/manifests/services/bgpvpn.pp index 2e6f7cb39..6cf31ae9a 100644 --- a/manifests/services/bgpvpn.pp +++ b/manifests/services/bgpvpn.pp @@ -41,10 +41,10 @@ # Default to false. # class neutron::services::bgpvpn ( - $package_ensure = 'present', - $service_providers = 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default', - Boolean $sync_db = false, - $purge_config = false, + Stdlib::Ensure::Package $package_ensure = 'present', + $service_providers = 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default', + Boolean $sync_db = false, + $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/services/dr.pp b/manifests/services/dr.pp index 7561411e8..5d200d10e 100644 --- a/manifests/services/dr.pp +++ b/manifests/services/dr.pp @@ -16,9 +16,9 @@ # Default to false. # class neutron::services::dr ( - $package_ensure = 'present', - $bgp_drscheduler_driver = $facts['os_service_default'], - Boolean $sync_db = false, + Stdlib::Ensure::Package $package_ensure = 'present', + $bgp_drscheduler_driver = $facts['os_service_default'], + Boolean $sync_db = false, ) { include neutron::deps include neutron::params diff --git a/manifests/services/fwaas.pp b/manifests/services/fwaas.pp index 203b36d68..f94a2af4e 100644 --- a/manifests/services/fwaas.pp +++ b/manifests/services/fwaas.pp @@ -22,10 +22,10 @@ # Defaults to false. # class neutron::services::fwaas ( - $package_ensure = 'present', - $service_providers = 'FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.agents.agents.FirewallAgentDriver:default', - Boolean $sync_db = false, - Boolean $purge_config = false, + Stdlib::Ensure::Package $package_ensure = 'present', + $service_providers = 'FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.agents.agents.FirewallAgentDriver:default', + Boolean $sync_db = false, + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/services/l2gw.pp b/manifests/services/l2gw.pp index c99694474..cf3794ca8 100644 --- a/manifests/services/l2gw.pp +++ b/manifests/services/l2gw.pp @@ -43,14 +43,14 @@ # Defaults to false. # class neutron::services::l2gw ( - $default_interface_name = $facts['os_service_default'], - $default_device_name = $facts['os_service_default'], - $quota_l2_gateway = $facts['os_service_default'], - $periodic_monitoring_interval = $facts['os_service_default'], - $service_providers = 'L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.rpc_l2gw.L2gwRpcDriver:default', - Boolean $sync_db = false, - $package_ensure = 'present', - Boolean $purge_config = false, + $default_interface_name = $facts['os_service_default'], + $default_device_name = $facts['os_service_default'], + $quota_l2_gateway = $facts['os_service_default'], + $periodic_monitoring_interval = $facts['os_service_default'], + $service_providers = 'L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.rpc_l2gw.L2gwRpcDriver:default', + Boolean $sync_db = false, + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/services/sfc.pp b/manifests/services/sfc.pp index 7b9171d1c..48ff9df54 100644 --- a/manifests/services/sfc.pp +++ b/manifests/services/sfc.pp @@ -54,14 +54,14 @@ # Defaults to $facts['os_service_default'] # class neutron::services::sfc ( - $package_ensure = 'present', - $sfc_drivers = $facts['os_service_default'], - $fc_drivers = $facts['os_service_default'], - Boolean $sync_db = false, - $purge_config = false, + Stdlib::Ensure::Package $package_ensure = 'present', + $sfc_drivers = $facts['os_service_default'], + $fc_drivers = $facts['os_service_default'], + Boolean $sync_db = false, + $purge_config = false, # DEPRECATED PARAMETERS - $sfc_driver = undef, - $fc_driver = undef, + $sfc_driver = undef, + $fc_driver = undef, ) { include neutron::deps include neutron::params diff --git a/manifests/services/taas.pp b/manifests/services/taas.pp index 5b613c350..4d2ccb281 100644 --- a/manifests/services/taas.pp +++ b/manifests/services/taas.pp @@ -38,14 +38,14 @@ # Defaults to false. # class neutron::services::taas ( - $package_ensure = 'present', - $service_providers = 'TAAS:TAAS:neutron_taas.services.taas.service_drivers.taas_rpc.TaasRpcDriver:default', - $quota_tap_service = $facts['os_service_default'], - $quota_tap_flow = $facts['os_service_default'], - $vlan_range_start = $facts['os_service_default'], - $vlan_range_end = $facts['os_service_default'], - Boolean $sync_db = false, - Boolean $purge_config = false, + Stdlib::Ensure::Package $package_ensure = 'present', + $service_providers = 'TAAS:TAAS:neutron_taas.services.taas.service_drivers.taas_rpc.TaasRpcDriver:default', + $quota_tap_service = $facts['os_service_default'], + $quota_tap_flow = $facts['os_service_default'], + $vlan_range_start = $facts['os_service_default'], + $vlan_range_end = $facts['os_service_default'], + Boolean $sync_db = false, + Boolean $purge_config = false, ) { include neutron::deps include neutron::params diff --git a/manifests/services/vpnaas.pp b/manifests/services/vpnaas.pp index 6b6f88fbb..d6561c3cf 100644 --- a/manifests/services/vpnaas.pp +++ b/manifests/services/vpnaas.pp @@ -35,13 +35,13 @@ # Defaults to false. # class neutron::services::vpnaas ( - $package_ensure = 'present', - $service_providers = 'VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default', - $vpn_scheduler_driver = $facts['os_service_default'], - $vpn_auto_schedule = $facts['os_service_default'], - $allow_automatic_vpnagent_failover = $facts['os_service_default'], - Boolean $sync_db = false, - Boolean $purge_config = false, + Stdlib::Ensure::Package $package_ensure = 'present', + $service_providers = 'VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default', + $vpn_scheduler_driver = $facts['os_service_default'], + $vpn_auto_schedule = $facts['os_service_default'], + $allow_automatic_vpnagent_failover = $facts['os_service_default'], + Boolean $sync_db = false, + Boolean $purge_config = false, ) { include neutron::deps include neutron::params