openstack/puppet-neutron
Code Issues Proposed changes

replace validate_legacy with proper data types

Browse Source 
the validate_legacy function is marked for deprecation in
v9.0.0 from puppetlabs-stdlib.

Change-Id: Ib124f05394b5f53cace06cd062ee2079afb311af
This commit is contained in:
Benedikt Trefzer 2023-06-17 14:43:28 +02:00
parent b44f40170f
commit be045c2479
25 changed files with 134 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/agents/bagpipe.pp
View File

@ -83,9 +83,9 @@ class neutron::agents::bagpipe (
$api_host = $facts['os_service_default'],
$api_port = $facts['os_service_default'],
$dataplane_driver_ipvpn = 'ovs',
$enabled = true,
Boolean $enabled = true,
$enable_rtc = $facts['os_service_default'],
$manage_service = true,
Boolean $manage_service = true,
$mpls_interface = $facts['os_service_default'],
$ovs_bridge = $facts['os_service_default'],
$package_ensure = 'present',
@ -95,9 +95,6 @@ class neutron::agents::bagpipe (
$local_address = $facts['networking']['ip'],
) {
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
include neutron::deps
include neutron::params

15
manifests/agents/bgp_dragent.pp
View File

@ -46,17 +46,14 @@
# Defaults to false
#
class neutron::agents::bgp_dragent(
$package_ensure = 'present',
$enabled = true,
$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,
$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'],
$purge_config = false,
) {
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
include neutron::deps
include neutron::params

62
manifests/agents/dhcp.pp
View File

@ -126,45 +126,39 @@
# Defaults to $facts['os_service_default']
#
class neutron::agents::dhcp (
$package_ensure = present,
$enabled = true,
$manage_service = true,
$debug = $facts['os_service_default'],
$state_path = '/var/lib/neutron',
$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'],
$enable_isolated_metadata = false,
$enable_force_metadata = false,
$enable_metadata_network = false,
$dhcp_broadcast_reply = $facts['os_service_default'],
$purge_config = false,
$availability_zone = $facts['os_service_default'],
$ovs_integration_bridge = $facts['os_service_default'],
$ovsdb_connection = $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'],
$package_ensure = present,
Boolean $enabled = true,
Boolean $manage_service = true,
$debug = $facts['os_service_default'],
$state_path = '/var/lib/neutron',
$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'],
$purge_config = false,
$availability_zone = $facts['os_service_default'],
$ovs_integration_bridge = $facts['os_service_default'],
$ovsdb_connection = $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
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
validate_legacy(Boolean, 'validate_bool', $enable_isolated_metadata)
validate_legacy(Boolean, 'validate_bool', $enable_force_metadata)
validate_legacy(Boolean, 'validate_bool', $enable_metadata_network)
if (! ($enable_isolated_metadata or $enable_force_metadata)) and $enable_metadata_network {
fail('enable_metadata_network to true requires enable_isolated_metadata or enable_force_metadata also enabled.')
}

7
manifests/agents/l2gw.pp
View File

@ -71,8 +71,8 @@
#
class neutron::agents::l2gw (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
Boolean $enabled = true,
Boolean $manage_service = true,
$debug = $facts['os_service_default'],
$ovsdb_hosts = $facts['os_service_default'],
$enable_manager = false,
@ -86,9 +86,6 @@ class neutron::agents::l2gw (
$purge_config = false,
) {
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
include neutron::deps
include neutron::params

10
manifests/agents/l3.pp
View File

@ -124,8 +124,8 @@
#
class neutron::agents::l3 (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
Boolean $enabled = true,
Boolean $manage_service = true,
$debug = $facts['os_service_default'],
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$handle_internal_only_routers = $facts['os_service_default'],
@ -133,7 +133,7 @@ class neutron::agents::l3 (
$periodic_interval = $facts['os_service_default'],
$periodic_fuzzy_delay = $facts['os_service_default'],
$enable_metadata_proxy = $facts['os_service_default'],
$ha_enabled = false,
Boolean $ha_enabled = false,
$ha_vrrp_auth_type = 'PASS',
$ha_vrrp_auth_password = $facts['os_service_default'],
$ha_vrrp_advert_int = '3',
@ -150,10 +150,6 @@ class neutron::agents::l3 (
$network_log_local_output_log_base = $facts['os_service_default'],
) {
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
validate_legacy(Boolean, 'validate_bool', $ha_enabled)
include neutron::deps
include neutron::params

7
manifests/agents/metadata.pp
View File

@ -76,8 +76,8 @@
class neutron::agents::metadata (
$shared_secret,
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
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'],
@ -94,9 +94,6 @@ class neutron::agents::metadata (
$purge_config = false,
) {
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
include neutron::deps
include neutron::params

7
manifests/agents/metering.pp
View File

@ -67,8 +67,8 @@
#
class neutron::agents::metering (
$package_ensure = present,
$enabled = true,
$manage_service = true,
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',
@ -79,9 +79,6 @@ class neutron::agents::metering (
$purge_config = false,
) {
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
include neutron::deps
include neutron::params

36
manifests/agents/ml2/linuxbridge.pp
View File

@ -73,29 +73,23 @@
# Defaults to false.
#
class neutron::agents::ml2::linuxbridge (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
$tunnel_types = [],
$local_ip = false,
$vxlan_group = $facts['os_service_default'],
$vxlan_ttl = $facts['os_service_default'],
$vxlan_tos = $facts['os_service_default'],
$polling_interval = $facts['os_service_default'],
$rpc_response_max_timeout = $facts['os_service_default'],
$l2_population = $facts['os_service_default'],
$physical_interface_mappings = [],
$bridge_mappings = [],
$firewall_driver = 'iptables',
$purge_config = false,
$package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
Array $tunnel_types = [],
$local_ip = false,
$vxlan_group = $facts['os_service_default'],
$vxlan_ttl = $facts['os_service_default'],
$vxlan_tos = $facts['os_service_default'],
$polling_interval = $facts['os_service_default'],
$rpc_response_max_timeout = $facts['os_service_default'],
$l2_population = $facts['os_service_default'],
Array $physical_interface_mappings = [],
Array $bridge_mappings = [],
$firewall_driver = 'iptables',
$purge_config = false,
) {
validate_legacy(Array, 'validate_array', $tunnel_types)
validate_legacy(Array, 'validate_array', $physical_interface_mappings)
validate_legacy(Array, 'validate_array', $bridge_mappings)
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
include neutron::deps
include neutron::params

16
manifests/agents/ml2/macvtap.pp
View File

@ -32,18 +32,14 @@
# Defaults to false.
#
class neutron::agents::ml2::macvtap (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
$polling_interval = $facts['os_service_default'],
$physical_interface_mappings = [],
$purge_config = false,
$package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
$polling_interval = $facts['os_service_default'],
Array $physical_interface_mappings = [],
$purge_config = false,
) {
validate_legacy(Array, 'validate_array', $physical_interface_mappings)
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
include neutron::deps
include neutron::params

12
manifests/agents/ml2/mlnx.pp
View File

@ -53,10 +53,10 @@
# Defaults to false
#
class neutron::agents::ml2::mlnx (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
$manage_package = true,
$package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
Boolean $manage_package = true,
$physical_interface_mappings = $facts['os_service_default'],
$polling_interval = $facts['os_service_default'],
$multi_interface_driver_mappings = $facts['os_service_default'],
@ -64,10 +64,6 @@ class neutron::agents::ml2::mlnx (
$enable_multi_interface_driver_cache_maintenance = false,
) {
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
validate_legacy(Boolean, 'validate_bool', $manage_package)
include neutron::deps
include neutron::params

7
manifests/agents/ml2/networking_baremetal.pp
View File

@ -102,8 +102,8 @@
#
class neutron::agents::ml2::networking_baremetal (
$password,
$enabled = true,
$manage_service = true,
Boolean $enabled = true,
Boolean $manage_service = true,
$package_ensure = 'present',
$endpoint_override = $facts['os_service_default'],
$cafile = $facts['os_service_default'],
@ -125,9 +125,6 @@ class neutron::agents::ml2::networking_baremetal (
$report_interval = $facts['os_service_default'],
) {
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
include neutron::deps
include neutron::params

7
manifests/agents/ml2/ovn.pp
View File

@ -102,8 +102,8 @@
#
class neutron::agents::ml2::ovn (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
Boolean $enabled = true,
Boolean $manage_service = true,
$debug = $facts['os_service_default'],
$ovsdb_connection = 'tcp:127.0.0.1:6640',
$ovs_manager = 'ptcp:6640:127.0.0.1',
@ -125,9 +125,6 @@ class neutron::agents::ml2::ovn (
$purge_config = false,
) {
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
include neutron::deps
include neutron::params

16
manifests/agents/ml2/ovs.pp
View File

@ -261,8 +261,8 @@
#
class neutron::agents::ml2::ovs (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
Boolean $enabled = true,
Boolean $manage_service = true,
$extensions = $facts['os_service_default'],
$bridge_uplinks = [],
$bridge_mappings = [],
@ -273,7 +273,7 @@ class neutron::agents::ml2::ovs (
$of_request_timeout = $facts['os_service_default'],
$of_inactivity_probe = $facts['os_service_default'],
$integration_bridge = $facts['os_service_default'],
$tunnel_types = [],
Array $tunnel_types = [],
$local_ip = false,
$tunnel_bridge = $facts['os_service_default'],
$vxlan_udp_port = $facts['os_service_default'],
@ -285,13 +285,13 @@ class neutron::agents::ml2::ovs (
$firewall_driver = 'iptables_hybrid',
$enable_distributed_routing = $facts['os_service_default'],
$drop_flows_on_start = $facts['os_service_default'],
$manage_vswitch = true,
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'],
$purge_config = false,
$enable_dpdk = false,
Boolean $enable_dpdk = false,
$enable_security_group = $facts['os_service_default'],
$permitted_ethertypes = $facts['os_service_default'],
$minimize_polling = $facts['os_service_default'],
@ -314,11 +314,6 @@ class neutron::agents::ml2::ovs (
$network_log_local_output_log_base = $facts['os_service_default'],
) {
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
validate_legacy(Boolean, 'validate_bool', $manage_vswitch)
validate_legacy(Boolean, 'validate_bool', $enable_dpdk)
include neutron::deps
include neutron::params
@ -342,7 +337,6 @@ class neutron::agents::ml2::ovs (
}
}
validate_legacy(Array, 'validate_array', $tunnel_types)
if size($tunnel_types) > 0 {
$enable_tunneling = true
} else {

7
manifests/agents/ml2/sriov.pp
View File

@ -99,8 +99,8 @@
#
class neutron::agents::ml2::sriov (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
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,
@ -115,9 +115,6 @@ class neutron::agents::ml2::sriov (
$resource_provider_inventory_defaults = {},
) {
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
include neutron::deps
include neutron::params

7
manifests/agents/ovn_metadata.pp
View File

@ -121,8 +121,8 @@
class neutron::agents::ovn_metadata (
$shared_secret,
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
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'],
@ -148,9 +148,6 @@ class neutron::agents::ovn_metadata (
$purge_config = false,
) {
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
include neutron::deps
include neutron::params

67
manifests/config.pp
View File

@ -93,29 +93,29 @@
# or Puppet catalog compilation will fail with duplicate resources.
#
class neutron::config (
$server_config = {},
$api_paste_ini = {},
$ovs_agent_config = {},
$ovn_agent_config = {},
$sriov_agent_config = {},
$macvtap_agent_config = {},
$bgpvpn_bagpipe_config = {},
$bgpvpn_service_config = {},
$l2gw_agent_config = {},
$l2gw_service_config = {},
$sfc_service_config = {},
$l3_agent_config = {},
$dhcp_agent_config = {},
$metadata_agent_config = {},
$ovn_metadata_agent_config = {},
$metering_agent_config = {},
$vpnaas_agent_config = {},
$bgp_dragent_config = {},
$plugin_opencontrail_config = {},
$plugin_nuage_config = {},
$plugin_ml2_config = {},
Hash $server_config = {},
Hash $api_paste_ini = {},
Hash $ovs_agent_config = {},
Hash $ovn_agent_config = {},
Hash $sriov_agent_config = {},
Hash $macvtap_agent_config = {},
Hash $bgpvpn_bagpipe_config = {},
Hash $bgpvpn_service_config = {},
Hash $l2gw_agent_config = {},
Hash $l2gw_service_config = {},
Hash $sfc_service_config = {},
Hash $l3_agent_config = {},
Hash $dhcp_agent_config = {},
Hash $metadata_agent_config = {},
Hash $ovn_metadata_agent_config = {},
Hash $metering_agent_config = {},
Hash $vpnaas_agent_config = {},
Hash $bgp_dragent_config = {},
Hash $plugin_opencontrail_config = {},
Hash $plugin_nuage_config = {},
Hash $plugin_ml2_config = {},
# DEPRECATED PARAMETERS
$linuxbridge_agent_config = undef,
Optional[Hash] $linuxbridge_agent_config = undef,
) {
include neutron::deps
@ -127,29 +127,6 @@ class neutron::config (
$linuxbridge_agent_config_real = {}
}
validate_legacy(Hash, 'validate_hash', $server_config)
validate_legacy(Hash, 'validate_hash', $api_paste_ini)
validate_legacy(Hash, 'validate_hash', $ovs_agent_config)
validate_legacy(Hash, 'validate_hash', $ovn_agent_config)
validate_legacy(Hash, 'validate_hash', $sriov_agent_config)
validate_legacy(Hash, 'validate_hash', $linuxbridge_agent_config_real)
validate_legacy(Hash, 'validate_hash', $macvtap_agent_config)
validate_legacy(Hash, 'validate_hash', $bgpvpn_bagpipe_config)
validate_legacy(Hash, 'validate_hash', $bgpvpn_service_config)
validate_legacy(Hash, 'validate_hash', $l2gw_agent_config)
validate_legacy(Hash, 'validate_hash', $l2gw_service_config)
validate_legacy(Hash, 'validate_hash', $sfc_service_config)
validate_legacy(Hash, 'validate_hash', $l3_agent_config)
validate_legacy(Hash, 'validate_hash', $dhcp_agent_config)
validate_legacy(Hash, 'validate_hash', $metadata_agent_config)
validate_legacy(Hash, 'validate_hash', $ovn_metadata_agent_config)
validate_legacy(Hash, 'validate_hash', $metering_agent_config)
validate_legacy(Hash, 'validate_hash', $vpnaas_agent_config)
validate_legacy(Hash, 'validate_hash', $bgp_dragent_config)
validate_legacy(Hash, 'validate_hash', $plugin_opencontrail_config)
validate_legacy(Hash, 'validate_hash', $plugin_nuage_config)
validate_legacy(Hash, 'validate_hash', $plugin_ml2_config)
create_resources('neutron_config', $server_config)
create_resources('neutron_api_paste_ini', $api_paste_ini)
create_resources('neutron_agent_ovs', $ovs_agent_config)

4
manifests/db/mysql.pp
View File

@ -31,7 +31,7 @@
# Defaults to 'utf8_general_ci'
#
class neutron::db::mysql (
$password,
String[1] $password,
$dbname = 'neutron',
$user = 'neutron',
$host = '127.0.0.1',
@ -42,8 +42,6 @@ class neutron::db::mysql (
include neutron::deps
validate_legacy(String, 'validate_string', $password)
::openstacklib::db::mysql { 'neutron':
user => $user,
password => $password,

3
manifests/plugins/ml2/ovs_driver.pp
View File

@ -20,9 +20,8 @@
# Defaults to []
#
class neutron::plugins::ml2::ovs_driver (
$vnic_type_prohibit_list = [],
Array $vnic_type_prohibit_list = [],
){
validate_legacy(Array, 'validate_array', $vnic_type_prohibit_list)
if !empty($vnic_type_prohibit_list) {
neutron_plugin_ml2 {
'ovs_driver/vnic_type_prohibit_list': value => join(any2array($vnic_type_prohibit_list), ',');

3
manifests/plugins/ml2/sriov_driver.pp
View File

@ -20,9 +20,8 @@
# Defaults to []
#
class neutron::plugins::ml2::sriov_driver (
$vnic_type_prohibit_list = [],
Array $vnic_type_prohibit_list = [],
){
validate_legacy(Array, 'validate_array', $vnic_type_prohibit_list)
if !empty($vnic_type_prohibit_list) {
neutron_plugin_ml2 {
'sriov_driver/vnic_type_prohibit_list': value => join(any2array($vnic_type_prohibit_list), ',');

39
manifests/plugins/ovs/opendaylight.pp
View File

@ -96,30 +96,25 @@ class neutron::plugins::ovs::opendaylight (
$tunnel_ip,
$odl_username,
$odl_password,
$odl_check_url = 'http://127.0.0.1:8080/restconf/operational/network-topology:network-topology/topology/netvirt:1',
$odl_ovsdb_iface = 'tcp:127.0.0.1:6640',
$ovsdb_server_iface = 'ptcp:6639:127.0.0.1',
$provider_mappings = [],
$retry_interval = 60,
$retry_count = 20,
$host_id = $fqdn,
$allowed_network_types = ['local', 'flat', 'vlan', 'vxlan', 'gre'],
$enable_dpdk = false,
$vhostuser_socket_dir = '/var/run/openvswitch',
$vhostuser_mode = 'server',
$enable_hw_offload = false,
$enable_tls = false,
$tls_key_file = undef,
$tls_cert_file = undef,
$tls_ca_cert_file = undef,
$enable_ipv6 = false,
$odl_check_url = 'http://127.0.0.1:8080/restconf/operational/network-topology:network-topology/topology/netvirt:1',
$odl_ovsdb_iface = 'tcp:127.0.0.1:6640',
$ovsdb_server_iface = 'ptcp:6639:127.0.0.1',
$provider_mappings = [],
$retry_interval = 60,
$retry_count = 20,
$host_id = $fqdn,
$allowed_network_types = ['local', 'flat', 'vlan', 'vxlan', 'gre'],
Boolean $enable_dpdk = false,
$vhostuser_socket_dir = '/var/run/openvswitch',
$vhostuser_mode = 'server',
Boolean $enable_hw_offload = false,
Boolean $enable_tls = false,
$tls_key_file = undef,
$tls_cert_file = undef,
$tls_ca_cert_file = undef,
Boolean $enable_ipv6 = false,
) {
validate_legacy(Boolean, 'validate_bool', $enable_tls)
validate_legacy(Boolean, 'validate_bool', $enable_hw_offload)
validate_legacy(Boolean, 'validate_bool', $enable_dpdk)
validate_legacy(Boolean, 'validate_bool', $enable_ipv6)
include neutron::deps
warning('Support for networking-odl has been deprecated.')

4
manifests/policy.pp
View File

@ -48,7 +48,7 @@
class neutron::policy (
$enforce_scope = $facts['os_service_default'],
$enforce_new_defaults = $facts['os_service_default'],
$policies = {},
Hash $policies = {},
$policy_path = '/etc/neutron/policy.yaml',
$policy_default_rule = $facts['os_service_default'],
$policy_dirs = $facts['os_service_default'],
@ -58,8 +58,6 @@ class neutron::policy (
include neutron::deps
include neutron::params
validate_legacy(Hash, 'validate_hash', $policies)
$policy_parameters = {
policies => $policies,
policy_path => $policy_path,

16
manifests/server.pp
View File

@ -237,15 +237,15 @@
#
class neutron::server (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
Boolean $enabled = true,
Boolean $manage_service = true,
$service_name = $::neutron::params::server_service,
$server_package = $::neutron::params::server_package,
$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,
$sync_db = false,
Boolean $sync_db = false,
$api_workers = $facts['os_workers'],
$rpc_workers = $facts['os_workers'],
$rpc_state_report_workers = $facts['os_service_default'],
@ -266,8 +266,8 @@ class neutron::server (
$l3_ha_network_type = $facts['os_service_default'],
$l3_ha_network_physical_name = $facts['os_service_default'],
$network_auto_schedule = $facts['os_service_default'],
$ensure_vpnaas_package = false,
$ensure_dr_package = false,
Boolean $ensure_vpnaas_package = false,
Boolean $ensure_dr_package = false,
$vpnaas_agent_package = false,
$service_providers = $facts['os_service_default'],
$auth_strategy = 'keystone',
@ -277,12 +277,6 @@ class neutron::server (
$igmp_snooping_enable = $facts['os_service_default'],
) inherits neutron::params {
validate_legacy(Boolean, 'validate_bool', $enabled)
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $sync_db)
validate_legacy(Boolean, 'validate_bool', $ensure_vpnaas_package)
validate_legacy(Boolean, 'validate_bool', $ensure_dr_package)
include neutron::deps
include neutron::db
include neutron::policy

4
manifests/services/bgpvpn.pp
View File

@ -40,12 +40,10 @@
class neutron::services::bgpvpn (
$package_ensure = 'present',
$service_providers = $facts['os_service_default'],
$sync_db = false,
Boolean $sync_db = false,
$purge_config = false,
) {
validate_legacy(Boolean, 'validate_bool', $sync_db)
include neutron::deps
include neutron::params

4
manifests/services/l2gw.pp
View File

@ -48,13 +48,11 @@ class neutron::services::l2gw (
$quota_l2_gateway = $facts['os_service_default'],
$periodic_monitoring_interval = $facts['os_service_default'],
$service_providers = $facts['os_service_default'],
$sync_db = false,
Boolean $sync_db = false,
$package_ensure = 'present',
$purge_config = false,
) {
validate_legacy(Boolean, 'validate_bool', $sync_db)
include neutron::deps
include neutron::params

4
manifests/services/sfc.pp
View File

@ -46,12 +46,10 @@ class neutron::services::sfc (
$package_ensure = 'present',
$sfc_driver = $facts['os_service_default'],
$fc_driver = $facts['os_service_default'],
$sync_db = false,
Boolean $sync_db = false,
$purge_config = false,
) {
validate_legacy(Boolean, 'validate_bool', $sync_db)
include neutron::deps
include neutron::params