diff --git a/manifests/agents/bagpipe.pp b/manifests/agents/bagpipe.pp index c0a4df48f..687343089 100644 --- a/manifests/agents/bagpipe.pp +++ b/manifests/agents/bagpipe.pp @@ -95,6 +95,9 @@ 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 diff --git a/manifests/agents/bgp_dragent.pp b/manifests/agents/bgp_dragent.pp index e151a8d27..b1299f808 100644 --- a/manifests/agents/bgp_dragent.pp +++ b/manifests/agents/bgp_dragent.pp @@ -54,6 +54,9 @@ class neutron::agents::bgp_dragent( $purge_config = false, ) { + validate_legacy(Boolean, 'validate_bool', $manage_service) + validate_legacy(Boolean, 'validate_bool', $enabled) + include neutron::deps include neutron::params diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp index 28f00397f..aa4d0db11 100644 --- a/manifests/agents/dhcp.pp +++ b/manifests/agents/dhcp.pp @@ -158,9 +158,11 @@ class neutron::agents::dhcp ( include neutron::deps include neutron::params - validate_legacy('Boolean', 'validate_bool', $enable_isolated_metadata) - validate_legacy('Boolean', 'validate_bool', $enable_force_metadata) - validate_legacy('Boolean', 'validate_bool', $enable_metadata_network) + 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.') diff --git a/manifests/agents/l2gw.pp b/manifests/agents/l2gw.pp index 997b95778..2e5d356cf 100644 --- a/manifests/agents/l2gw.pp +++ b/manifests/agents/l2gw.pp @@ -86,6 +86,9 @@ 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 diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp index 214538b56..d9dba37b4 100644 --- a/manifests/agents/l3.pp +++ b/manifests/agents/l3.pp @@ -150,6 +150,10 @@ 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 diff --git a/manifests/agents/metadata.pp b/manifests/agents/metadata.pp index 02e336fbe..7db1bff7e 100644 --- a/manifests/agents/metadata.pp +++ b/manifests/agents/metadata.pp @@ -92,7 +92,10 @@ class neutron::agents::metadata ( $report_interval = $facts['os_service_default'], $rpc_response_max_timeout = $facts['os_service_default'], $purge_config = false, - ) { +) { + + validate_legacy(Boolean, 'validate_bool', $manage_service) + validate_legacy(Boolean, 'validate_bool', $enabled) include neutron::deps include neutron::params diff --git a/manifests/agents/metering.pp b/manifests/agents/metering.pp index a29627cdc..851736957 100644 --- a/manifests/agents/metering.pp +++ b/manifests/agents/metering.pp @@ -79,6 +79,9 @@ 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 diff --git a/manifests/agents/ml2/linuxbridge.pp b/manifests/agents/ml2/linuxbridge.pp index cc9fbdf04..dfdec380d 100644 --- a/manifests/agents/ml2/linuxbridge.pp +++ b/manifests/agents/ml2/linuxbridge.pp @@ -93,6 +93,8 @@ class neutron::agents::ml2::linuxbridge ( 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 diff --git a/manifests/agents/ml2/macvtap.pp b/manifests/agents/ml2/macvtap.pp index 89cbc1cd4..bfc7f273a 100644 --- a/manifests/agents/ml2/macvtap.pp +++ b/manifests/agents/ml2/macvtap.pp @@ -41,6 +41,8 @@ class neutron::agents::ml2::macvtap ( ) { 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 diff --git a/manifests/agents/ml2/mlnx.pp b/manifests/agents/ml2/mlnx.pp index c4917ccd8..ca362e32d 100644 --- a/manifests/agents/ml2/mlnx.pp +++ b/manifests/agents/ml2/mlnx.pp @@ -64,6 +64,10 @@ 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 diff --git a/manifests/agents/ml2/networking_baremetal.pp b/manifests/agents/ml2/networking_baremetal.pp index 029321a18..2f0b05311 100644 --- a/manifests/agents/ml2/networking_baremetal.pp +++ b/manifests/agents/ml2/networking_baremetal.pp @@ -125,6 +125,9 @@ 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 diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp index 2051bf4f3..0a5be9c20 100644 --- a/manifests/agents/ml2/ovs.pp +++ b/manifests/agents/ml2/ovs.pp @@ -314,6 +314,11 @@ 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 diff --git a/manifests/agents/ml2/sriov.pp b/manifests/agents/ml2/sriov.pp index fc46ee197..f92ad35b5 100644 --- a/manifests/agents/ml2/sriov.pp +++ b/manifests/agents/ml2/sriov.pp @@ -115,6 +115,9 @@ 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 diff --git a/manifests/agents/ovn_metadata.pp b/manifests/agents/ovn_metadata.pp index 2eb7f77de..2f177feac 100644 --- a/manifests/agents/ovn_metadata.pp +++ b/manifests/agents/ovn_metadata.pp @@ -140,7 +140,10 @@ class neutron::agents::ovn_metadata ( $root_helper_daemon = $facts['os_service_default'], $state_path = '/var/lib/neutron', $purge_config = false, - ) { +) { + + validate_legacy(Boolean, 'validate_bool', $manage_service) + validate_legacy(Boolean, 'validate_bool', $enabled) include neutron::deps include neutron::params diff --git a/manifests/init.pp b/manifests/init.pp index 9c9ae0087..2ff301d6e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,10 +5,6 @@ # # === Parameters: # -# [*enabled*] -# (required) Whether or not to enable the neutron service -# true/false -# # [*package_ensure*] # (optional) The state of the package # Defaults to 'present' @@ -309,8 +305,12 @@ # (optional) Allow plugins that support it to create VLAN transparent networks # Defaults to $facts['os_service_default'] # +# DEPRECATED PARAMETERS +# +# [*enabled*] +# (required) Whether or not to enable the neutron service +# class neutron ( - $enabled = true, $package_ensure = 'present', $bind_host = $facts['os_service_default'], $bind_port = $facts['os_service_default'], @@ -375,11 +375,17 @@ class neutron ( $notification_transport_url = $facts['os_service_default'], $max_allowed_address_pair = $facts['os_service_default'], $vlan_transparent = $facts['os_service_default'], + # DEPRECATED PARAMETERS + $enabled = undef, ) { include neutron::deps include neutron::params + if $enabled != undef { + warning('The neutron::enabled parameter has been deprecated and has no effect') + } + if ! is_service_default($use_ssl) and ($use_ssl) { if is_service_default($cert_file) { fail('The cert_file parameter is required when use_ssl is set to true') diff --git a/manifests/plugins/ovs/opendaylight.pp b/manifests/plugins/ovs/opendaylight.pp index c25dbde78..6a23e16a9 100644 --- a/manifests/plugins/ovs/opendaylight.pp +++ b/manifests/plugins/ovs/opendaylight.pp @@ -114,6 +114,11 @@ class neutron::plugins::ovs::opendaylight ( $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 # Handle the case where ODL controller is also on this host diff --git a/manifests/server.pp b/manifests/server.pp index a5c2bba8e..7a0a54d05 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -277,6 +277,12 @@ 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 diff --git a/manifests/services/bgpvpn.pp b/manifests/services/bgpvpn.pp index 950448296..70dba0178 100644 --- a/manifests/services/bgpvpn.pp +++ b/manifests/services/bgpvpn.pp @@ -44,6 +44,8 @@ class neutron::services::bgpvpn ( $purge_config = false, ) { + validate_legacy(Boolean, 'validate_bool', $sync_db) + include neutron::deps include neutron::params diff --git a/manifests/services/l2gw.pp b/manifests/services/l2gw.pp index 8b67543bb..1b0bfe5c6 100644 --- a/manifests/services/l2gw.pp +++ b/manifests/services/l2gw.pp @@ -53,6 +53,8 @@ class neutron::services::l2gw ( $purge_config = false, ) { + validate_legacy(Boolean, 'validate_bool', $sync_db) + include neutron::deps include neutron::params diff --git a/manifests/services/sfc.pp b/manifests/services/sfc.pp index 96eeca2a4..1ca4f88f6 100644 --- a/manifests/services/sfc.pp +++ b/manifests/services/sfc.pp @@ -50,6 +50,8 @@ class neutron::services::sfc ( $purge_config = false, ) { + validate_legacy(Boolean, 'validate_bool', $sync_db) + include neutron::deps include neutron::params @@ -60,8 +62,8 @@ class neutron::services::sfc ( }) neutron_sfc_service_config { - 'sfc/drivers': value => $sfc_driver; - 'flowclassifier/drivers': value => $fc_driver; + 'sfc/drivers': value => $sfc_driver; + 'flowclassifier/drivers': value => $fc_driver; } resources { 'neutron_sfc_service_config': diff --git a/releasenotes/notes/deprecate-neutron-enabled-03a7d590daed2116.yaml b/releasenotes/notes/deprecate-neutron-enabled-03a7d590daed2116.yaml new file mode 100644 index 000000000..cd3ee0e6d --- /dev/null +++ b/releasenotes/notes/deprecate-neutron-enabled-03a7d590daed2116.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The `neutron::enabled`` parameter has been deprecated. This parameter has + been unused and has had no effect.