diff --git a/README.md b/README.md index 3b79bcda1..7c7d2c9f5 100644 --- a/README.md +++ b/README.md @@ -48,12 +48,10 @@ To utilize the neutron module's functionality you will need to declare multiple ```puppet # enable the neutron service class { '::neutron': - enabled => true, - bind_host => '127.0.0.1', - rabbit_host => '127.0.0.1', - rabbit_user => 'neutron', - rabbit_password => 'rabbit_secret', - debug => false, + enabled => true, + bind_host => '127.0.0.1', + default_transport_url => 'rabbit://neutron:passw0rd@localhost:5672/neutron', + debug => false, } # configure authentication diff --git a/examples/cisco_ml2.pp b/examples/cisco_ml2.pp index 4c9c1387e..ea9a32198 100644 --- a/examples/cisco_ml2.pp +++ b/examples/cisco_ml2.pp @@ -1,10 +1,8 @@ class { '::neutron': - enabled => true, - bind_host => '127.0.0.1', - rabbit_host => '127.0.0.1', - rabbit_user => 'neutron', - rabbit_password => 'rabbit_secret', - debug => true, + enabled => true, + bind_host => '127.0.0.1', + default_transport_url => 'rabbit://guest:password@localhost:5672/neutron', + debug => true, } class { '::neutron::server': diff --git a/examples/neutron.pp b/examples/neutron.pp index 1b7fbd953..47be9a053 100644 --- a/examples/neutron.pp +++ b/examples/neutron.pp @@ -4,9 +4,7 @@ # Configures everything in neutron.conf class { '::neutron': allow_overlapping_ips => true, - rabbit_password => 'password', - rabbit_user => 'guest', - rabbit_host => 'localhost', + default_transport_url => 'rabbit://guest:password@localhost:5672/neutron', service_plugins => ['metering'] } @@ -50,9 +48,7 @@ class { '::neutron::plugins::ml2': # over Rabbit and needs to know if overlapping IPs (namespaces) are in use class { '::neutron': allow_overlapping_ips => true, - rabbit_password => 'password', - rabbit_user => 'guest', - rabbit_host => 'localhost', + default_transport_url => 'rabbit://guest:password@localhost:5672/neutron', } # The agent/plugin combo also needs installed on clients diff --git a/examples/neutron_l3_with_to_uuid.pp b/examples/neutron_l3_with_to_uuid.pp index 45b1fa60e..42335e113 100644 --- a/examples/neutron_l3_with_to_uuid.pp +++ b/examples/neutron_l3_with_to_uuid.pp @@ -8,9 +8,7 @@ class { '::neutron': allow_overlapping_ips => true, - rabbit_password => 'password', - rabbit_user => 'guest', - rabbit_host => 'localhost', + default_transport_url => 'rabbit://guest:password@localhost:5672/neutron', service_plugins => ['router'] } diff --git a/examples/neutron_wsgi.pp b/examples/neutron_wsgi.pp index f23565689..a5a3ef2b1 100644 --- a/examples/neutron_wsgi.pp +++ b/examples/neutron_wsgi.pp @@ -1,9 +1,7 @@ # Example of manifest to deploy Neutron API in WSGI with Apache class { '::neutron': allow_overlapping_ips => true, - rabbit_password => 'password', - rabbit_user => 'guest', - rabbit_host => 'localhost', + default_transport_url => 'rabbit://guest:password@localhost:5672/neutron', } class { '::neutron::server': diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp index 088b3f2eb..6888b1c54 100644 --- a/manifests/agents/dhcp.pp +++ b/manifests/agents/dhcp.pp @@ -99,12 +99,6 @@ # (optional) The SSL CA cert file to use for Neutron agents to connect to OVSDB # Defaults to $::os_service_default # -# === Deprecated Parameters -# -# [*dhcp_domain*] -# (optional) Deprecated. Domain to use for building the hostnames -# Defaults to $::os_service_default -# class neutron::agents::dhcp ( $package_ensure = present, $enabled = true, @@ -129,8 +123,6 @@ class neutron::agents::dhcp ( $ovsdb_agent_ssl_key_file = $::os_service_default, $ovsdb_agent_ssl_cert_file = $::os_service_default, $ovsdb_agent_ssl_ca_file = $::os_service_default, - # DEPRECATED PARAMETERS - $dhcp_domain = $::os_service_default, ) { include ::neutron::deps @@ -158,7 +150,6 @@ class neutron::agents::dhcp ( 'DEFAULT/state_path': value => $state_path; 'DEFAULT/resync_interval': value => $resync_interval; 'DEFAULT/interface_driver': value => $interface_driver; - 'DEFAULT/dhcp_domain': value => $dhcp_domain; 'DEFAULT/dhcp_driver': value => $dhcp_driver; 'DEFAULT/root_helper': value => $root_helper; 'DEFAULT/dhcp_broadcast_reply': value => $dhcp_broadcast_reply; @@ -169,10 +160,6 @@ class neutron::agents::dhcp ( 'AGENT/availability_zone': value => $availability_zone; } - if ! is_service_default ($dhcp_domain) { - warning('The dhcp_domain parameter is deprecated and will be removed in future releases') - } - if $ovsdb_connection =~ /^ssl:/ { $req_ssl_opts = { 'ovsdb_agent_ssl_key_file' => $ovsdb_agent_ssl_key_file, diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp index da4296e29..c2c477413 100644 --- a/manifests/agents/l3.pp +++ b/manifests/agents/l3.pp @@ -87,13 +87,6 @@ # (optional) L3 agent extensions to enable. # Defaults to $::os_service_default # -# == Deprecated -# -# [*send_arp_for_ha*] -# (deprecated) Send this many gratuitous ARPs for HA setup. Set it below or equal to 0 -# to disable this feature. -# Defaults to $::os_service_default -# class neutron::agents::l3 ( $package_ensure = 'present', $enabled = true, @@ -114,8 +107,6 @@ class neutron::agents::l3 ( $purge_config = false, $availability_zone = $::os_service_default, $extensions = $::os_service_default, - # Deprecated - $send_arp_for_ha = $::os_service_default, ) { include ::neutron::deps @@ -133,18 +124,12 @@ class neutron::agents::l3 ( } } - if !is_service_default($send_arp_for_ha) { - deprecation('send_arp_for_ha', 'The l3-agent configuration option \ -send_arp_for_ha is deprecated in ocata release, and will be removed in Pike') - } - neutron_l3_agent_config { 'DEFAULT/debug': value => $debug; 'DEFAULT/interface_driver': value => $interface_driver; 'DEFAULT/gateway_external_network_id': value => $gateway_external_network_id; 'DEFAULT/handle_internal_only_routers': value => $handle_internal_only_routers; 'DEFAULT/metadata_port': value => $metadata_port; - 'DEFAULT/send_arp_for_ha': value => $send_arp_for_ha; 'DEFAULT/periodic_interval': value => $periodic_interval; 'DEFAULT/periodic_fuzzy_delay': value => $periodic_fuzzy_delay; 'DEFAULT/enable_metadata_proxy': value => $enable_metadata_proxy; diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp index 2efa48d47..ea7b5f661 100644 --- a/manifests/agents/ml2/ovs.pp +++ b/manifests/agents/ml2/ovs.pp @@ -150,12 +150,6 @@ # changes. (boolean value) # Defaults to $::os_service_default # -# === Deprecated Parameters -# -# [*enable_tunneling*] -# (optional) Enable or not tunneling -# Defaults to false -# class neutron::agents::ml2::ovs ( $package_ensure = 'present', $enabled = true, @@ -185,8 +179,6 @@ class neutron::agents::ml2::ovs ( $enable_dpdk = false, $enable_security_group = $::os_service_default, $minimize_polling = $::os_service_default, - # DEPRECATED PARAMETERS - $enable_tunneling = false, ) { include ::neutron::deps @@ -212,22 +204,18 @@ class neutron::agents::ml2::ovs ( } } - if $enable_tunneling { - warning('The enable_tunneling parameter is deprecated. Please set tunnel_types with the desired type to enable tunneling.') - } - validate_array($tunnel_types) - if $enable_tunneling or (size($tunnel_types) > 0) { - $enable_tunneling_real = true + if size($tunnel_types) > 0 { + $enable_tunneling = true } else { - $enable_tunneling_real = false + $enable_tunneling = false } - if $enable_tunneling_real and ! $local_ip { + if $enable_tunneling and ! $local_ip { fail('Local ip for ovs agent must be set when tunneling is enabled') } - if ($enable_tunneling_real) and (!is_service_default($enable_distributed_routing)) and (!is_service_default($l2_population)) { + if ($enable_tunneling) and (!is_service_default($enable_distributed_routing)) and (!is_service_default($l2_population)) { if $enable_distributed_routing and ! $l2_population { fail('L2 population must be enabled when DVR and tunneling are enabled') } @@ -296,7 +284,7 @@ class neutron::agents::ml2::ovs ( neutron_agent_ovs { 'securitygroup/firewall_driver': ensure => absent } } - if $enable_tunneling_real { + if $enable_tunneling { neutron_agent_ovs { 'ovs/tunnel_bridge': value => $tunnel_bridge; 'ovs/local_ip': value => $local_ip; diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp index e7034c3e7..a3f663575 100644 --- a/manifests/agents/vpnaas.pp +++ b/manifests/agents/vpnaas.pp @@ -38,35 +38,17 @@ # in the vpnaas config. # Defaults to false. # -# DEPRECATED PARAMETERS -# [*enabled*] -# (optional) Enable state for service. Defaults to undef. -# -# [*manage_service*] -# (optional) Whether to start/stop the service -# Defaults to undef class neutron::agents::vpnaas ( $package_ensure = present, $vpn_device_driver = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver', $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', $ipsec_status_check_interval = $::os_service_default, $purge_config = false, - # DEPRECATED PARAMETERS - $enabled = undef, - $manage_service = undef, ) { include ::neutron::deps include ::neutron::params - if $enabled{ - warning ('enabled is deprecated, has no effect and will be removed in a future release.') - } - - if $manage_service{ - warning ('manage_service is deprecated, has no effect and will be removed in a future release.') - } - case $vpn_device_driver { /\.OpenSwan/: { Package['openswan'] -> Package<| title == 'neutron-vpnaas-agent' |> diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp index 3c8a27f9d..7ad456870 100644 --- a/manifests/plugins/ml2.pp +++ b/manifests/plugins/ml2.pp @@ -127,13 +127,6 @@ # are 4 and 6. # Defaults to $::os_service_default # -# DEPRECATED PARAMETERS -# [*supported_pci_vendor_devs*] -# (optional) Supported PCI vendor devices, defined by -# vendor_id:product_id according to the PCI ID -# Repository. Should be an array of devices. -# Defaults to undef -# class neutron::plugins::ml2 ( $type_drivers = ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'], $extension_drivers = $::os_service_default, @@ -152,8 +145,6 @@ class neutron::plugins::ml2 ( $purge_config = false, $max_header_size = $::os_service_default, $overlay_ip_version = $::os_service_default, - # DEPRECATED PARAMETERS - $supported_pci_vendor_devs = undef, ) { include ::neutron::deps @@ -167,10 +158,6 @@ class neutron::plugins::ml2 ( warning('Security groups will not work without properly set firewall_driver') } - if $supported_pci_vendor_devs { - warning ('supported_pci_vendor_devs is deprecated, has no effect and will be removed in a future release.') - } - if !is_service_default($overlay_ip_version) and !("${overlay_ip_version}" in ['4', '6']) { fail('Invalid IP version for overlay_ip_version') } diff --git a/manifests/plugins/ovn.pp b/manifests/plugins/ovn.pp deleted file mode 100644 index 57fd0f749..000000000 --- a/manifests/plugins/ovn.pp +++ /dev/null @@ -1,56 +0,0 @@ -# == DEPRECATED -# This class has been deprecated in favor of neutron::plugins::ml2::ovn -# -# This class installs and configures the OVN Neutron plugin -# -# === Parameters -# -# [*ovsdb_connection*] -# (required) The connection string for the native OVSDB backend. -# -# [*ovsdb_connection_timeout*] -# (optional) Timeout in seconds for the OVSDB connection transaction -# Defaults to $::os_service_default -# -# [*neutron_sync_mode*] -# (optional) The synchronization mode of OVN with Neutron DB. -# Valid values are - 'log', 'off', 'repair' -# off - synchronization is off -# log - during neutron-server startup check to see if OVN is in sync with -# the Neutron database. Log warnings for any inconsistencies found so -# that an admin can investigate. -# repair - during neutron-server startup, automatically create resources -# found in Neutron but not in OVN. Also remove resources from OVN -# that are no longer in Neutron. -# Defaults to $::os_service_default -# -# [*ovn_l3_mode*] -# (optional) Whether to use OVN native L3 support. Do not change the -# value for existing deployments that contain routers. -# Type: boolean -# Defaults to $::os_service_default -# -# [*vif_type*] -# (optional) Type of VIF to be used for ports. -# Valid values are 'ovs','vhostuser' -# Defaults to $::os_service_default - -class neutron::plugins::ovn( - $ovsdb_connection, - $ovsdb_connection_timeout = $::os_service_default, - $neutron_sync_mode = $::os_service_default, - $ovn_l3_mode = $::os_service_default, - $vif_type = $::os_service_default, - ) { - - warning('neutron::plugins::ovn is deprecated in favor of neutron::plugins::ml2::ovn') - - class { '::neutron::plugins::ml2::ovn': - ovn_nb_connection => $ovsdb_connection, - ovsdb_connection_timeout => $ovsdb_connection_timeout, - neutron_sync_mode => $neutron_sync_mode, - ovn_l3_mode => $ovn_l3_mode, - vif_type => $vif_type - } - -} diff --git a/manifests/quota.pp b/manifests/quota.pp index 54937e692..f2f849aaf 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -87,13 +87,6 @@ # A negative value means unlimited. # Defaults to $::os_service_default. # -# -# DEPRECATED -# [*quota_health_monitor*] -# (optional) Number of health monitors allowed per tenant. -# A negative value means unlimited. -# Defaults to undef -# class neutron::quota ( $default_quota = $::os_service_default, $quota_network = $::os_service_default, @@ -116,19 +109,10 @@ class neutron::quota ( $quota_loadbalancer = $::os_service_default, $quota_pool = $::os_service_default, $quota_vip = $::os_service_default, - #DEPRECATED ARGS - $quota_health_monitor = undef, ) { include ::neutron::deps - if $quota_health_monitor and is_service_default($quota_healthmonitor) { - warning('quota_health_monitor is deprecated, use quota_healthmonitor') - $quota_healthmonitor_real = $quota_health_monitor - } else { - $quota_healthmonitor_real = $quota_healthmonitor - } - neutron_config { 'quotas/default_quota': value => $default_quota; 'quotas/quota_network': value => $quota_network; @@ -142,7 +126,7 @@ class neutron::quota ( 'quotas/quota_firewall': value => $quota_firewall; 'quotas/quota_firewall_policy': value => $quota_firewall_policy; 'quotas/quota_firewall_rule': value => $quota_firewall_rule; - 'quotas/quota_healthmonitor': value => $quota_healthmonitor_real; + 'quotas/quota_healthmonitor': value => $quota_healthmonitor; 'quotas/quota_member': value => $quota_member; 'quotas/quota_network_gateway': value => $quota_network_gateway; 'quotas/quota_packet_filter': value => $quota_packet_filter; diff --git a/manifests/server.pp b/manifests/server.pp index d7f525f9d..90ef3a6bf 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -5,19 +5,19 @@ # === Parameters # # [*package_ensure*] -# (optional) The state of the package +# (Optional) The state of the package # Defaults to present # # [*enabled*] -# (optional) The state of the service +# (Optional) The state of the service # Defaults to true # # [*manage_service*] -# (optional) Whether to start/stop the service +# (Optional) Whether to start/stop the service # Defaults to true # # [*service_name*] -# (optional) Name of the service that will be providing the +# (Optional) Name of the service that will be providing the # server functionality of neutron-api. # If the value is 'httpd', this means neutron API will be a web # service, and you must use another class to configure that @@ -25,112 +25,99 @@ # to make neutron-api be a web app using apache mod_wsgi. # If set to false, then neutron-server isn't in use, and we will # be using neutron-api and neutron-rpc-server instead. -# Defaults to '$::neutron::params::server_service' +# Defaults to $::neutron::params::server_service # # [*server_package*] -# (optional) Name of the package holding neutron-server. +# (Optional) Name of the package holding neutron-server. # If service_name is set to false, then this also must be # set to false. With false, no package will be installed # before running the neutron-server service. -# Defaults to '$::neutron::params::server_package' +# Defaults to $::neutron::params::server_package # # [*api_package_name*] -# (optional) Name of the package holding neutron-api. +# (Optional) Name of the package holding neutron-api. # If this parameter is set to false, -# Default to '$::neutron::params::api_package_name' +# Default to $::neutron::params::api_package_name # # [*api_service_name*] -# (optional) Name of the service for neutron-api. +# (Optional) Name of the service for neutron-api. # If service_name is set to false, this parameter must # be set with a value, so that an API server will run. -# Defaults to '$::neutron::params::api_service_name' +# Defaults to $::neutron::params::api_service_name # # [*rpc_package_name*] -# (optional) Name of the package for neutron-rpc-server. -# Default to '$::neutron::params::rpc_package_name' +# (Optional) Name of the package for neutron-rpc-server. +# Default to $::neutron::params::rpc_package_name # # [*rpc_service_name*] -# (optional) Name of the service for the RPC listener. +# (Optional) Name of the service for the RPC listener. # If service_name is set to false, this parameter must # be set with a value, so that an RPC server will run. -# Defaults to '$::neutron::params::rpc_service_name' +# Defaults to $::neutron::params::rpc_service_name # # [*validate*] -# (optional) Whether to validate the service is working after any service refreshes +# (Optional) Whether to validate the service is working after any service refreshes # Defaults to false # -# [*log_file*] -# REMOVED: Use log_file of neutron class instead. -# -# [*log_dir*] -# REMOVED: Use log_dir of neutron class instead. -# # [*database_connection*] -# (optional) Connection url for the neutron database. +# (Optional) Connection url for the neutron database. # (Defaults to undef) # # [*database_max_retries*] -# (optional) Maximum database connection retries during startup. +# (Optional) Maximum database connection retries during startup. # (Defaults to undef) # # [*database_idle_timeout*] -# (optional) Timeout before idle database connections are reaped. -# Deprecates sql_idle_timeout +# (Optional) Timeout before idle database connections are reaped. # (Defaults to undef) # # [*database_retry_interval*] -# (optional) Interval between retries of opening a database connection. +# (Optional) Interval between retries of opening a database connection. # (Defaults to 10) # # [*database_min_pool_size*] -# (optional) Minimum number of SQL connections to keep open in a pool. +# (Optional) Minimum number of SQL connections to keep open in a pool. # Defaults to: undef. # # [*database_max_pool_size*] -# (optional) Maximum number of SQL connections to keep open in a pool. +# (Optional) Maximum number of SQL connections to keep open in a pool. # Defaults to: undef. # # [*database_max_overflow*] -# (optional) If set, use this value for max_overflow with sqlalchemy. +# (Optional) If set, use this value for max_overflow with sqlalchemy. # Defaults to: undef. # # [*sync_db*] -# (optional) Run neutron-db-manage on api nodes after installing the package. +# (Optional) Run neutron-db-manage on api nodes after installing the package. # Defaults to false # # [*api_workers*] -# (optional) Number of separate worker processes to spawn. Greater than 0 +# (Optional) Number of separate worker processes to spawn. Greater than 0 # launches that number of child processes as workers. The parent process # manages them. # Defaults to: $::os_workers # # [*rpc_workers*] -# (optional) Number of separate worker processes to spawn. Greater than 0 +# (Optional) Number of separate worker processes to spawn. Greater than 0 # launches that number of child processes as workers. The parent process # manages them. # Defaults to: $::os_workers # # [*agent_down_time*] -# (optional) Seconds to regard the agent as down; should be at least twice +# (Optional) Seconds to regard the agent as down; should be at least twice # report_interval, to be sure the agent is down for good. # agent_down_time is a config for neutron-server, set by class neutron::server # report_interval is a config for neutron agents, set by class neutron # Defaults to: $::os_service_default # # [*enable_new_agents*] -# (optional) Agent starts with admin_state_up=False when enable_new_agents=False. In the +# (Optional) Agent starts with admin_state_up=False when enable_new_agents=False. In the # case, user's resources will not be scheduled automatically to the agent until # admin changes admin_state_up to True. # Defaults to: $::os_service_default # -# [*state_path*] -# (optional) Deprecated. Use state_path parameter on base neutron class instead. -# -# [*lock_path*] -# (optional) Deprecated. Use lock_path parameter on base neutron class instead. -# # [*network_scheduler_driver*] -# (optional) The scheduler used when scheduling networks +# (Optional) The scheduler used when scheduling networks # neutron.scheduler.dhcp_agent_scheduler.AZAwareWeightScheduler to use availability zone hints scheduling. # Defaults to $::os_service_default # @@ -141,24 +128,24 @@ # } # # [*router_scheduler_driver*] -# (optional) Driver to use for scheduling router to a default L3 agent. Could be: +# (Optional) Driver to use for scheduling router to a default L3 agent. Could be: # neutron.scheduler.l3_agent_scheduler.ChanceScheduler to schedule a router in a random way # neutron.scheduler.l3_agent_scheduler.LeastRoutersScheduler to allocate on an L3 agent with the least number of routers bound. # neutron.scheduler.l3_agent_scheduler.AZLeastRoutersScheduler to use availability zone hints. # Defaults to: neutron.scheduler.l3_agent_scheduler.ChanceScheduler # # [*router_distributed*] -# (optional) Setting the "router_distributed" flag to "True" will default to the creation +# (Optional) Setting the "router_distributed" flag to "True" will default to the creation # of distributed tenant routers. # Also can be the type of the router on the create request (admin-only attribute). # Defaults to $::os_service_default # # [*enable_dvr*] -# (optional) Setting the "enable_dvr" flag to "False" will disable "dvr" API extension exposure. +# (Optional) Setting the "enable_dvr" flag to "False" will disable "dvr" API extension exposure. # Defaults to $::os_service_default # # [*dhcp_load_type*] -# (optional) The resource type whos load is being reported by the agent. +# (Optional) The resource type whos load is being reported by the agent. # The expected values are either 'networks', 'subnets', 'ports'. # Defaults to $::os_service_default # @@ -169,7 +156,7 @@ # } # # [*default_availability_zones*] -# (optional) A list of availability zones that are picked when availability zone is not specified +# (Optional) A list of availability zones that are picked when availability zone is not specified # The expected input is an array when specified. # Defaults to $::os_service_default # @@ -180,53 +167,49 @@ # } # # [*allow_automatic_l3agent_failover*] -# (optional) Allow automatic rescheduling of routers from dead L3 agents with +# (Optional) Allow automatic rescheduling of routers from dead L3 agents with # admin_state_up set to True to alive agents. # Defaults to $::os_service_default # # [*allow_automatic_dhcp_failover*] -# (optional) Allow automatic rescheduling of dhcp from dead dhcp agents with +# (Optional) Allow automatic rescheduling of dhcp from dead dhcp agents with # admin_state_up set to True to alive agents. # Defaults to $::os_service_default # # [*l3_ha*] -# (optional) Enable high availability for virtual routers. +# (Optional) Enable high availability for virtual routers. # Defaults to false # # [*max_l3_agents_per_router*] -# (optional) Maximum number of l3 agents which a HA router will be scheduled on. If set to '0', a router will be scheduled on every agent. +# (Optional) Maximum number of l3 agents which a HA router will be scheduled on. If set to '0', a router will be scheduled on every agent. # Defaults to '3' # # [*l3_ha_net_cidr*] -# (optional) CIDR of the administrative network if HA mode is enabled. +# (Optional) CIDR of the administrative network if HA mode is enabled. # Defaults to $::os_service_default # -# [*report_interval*] -# (optional) Deprecated, does nothing. -# Defaults to 'undef'. -# # [*network_auto_schedule*] -# (optional) Allow auto scheduling networks to DHCP agent +# (Optional) Allow auto scheduling networks to DHCP agent # Defaults to $::os_service_default. # # [*ensure_vpnaas_package*] -# (optional) Ensures installation of VPNaaS package before starting API service. +# (Optional) Ensures installation of VPNaaS package before starting API service. # Set to true to ensure installation of the package that is required to start neutron service if service_plugin is enabled. # Defaults to false. # # [*ensure_fwaas_package*] -# (optional) Ensures installation of FWaaS package before starting API service. +# (Optional) Ensures installation of FWaaS package before starting API service. # Set to true to ensure installation of the package that is required to start neutron service if service_plugin is enabled. # Defaults to false. # # [*vpnaas_agent_package*] -# (optional) Use VPNaaS agent package instead of L3 agent package on debian platforms +# (Optional) Use VPNaaS agent package instead of L3 agent package on debian platforms # RedHat platforms won't take care of this parameter # true/false # Defaults to false # # [*service_providers*] -# (optional) (Array) Configures the service providers for neutron server. +# (Optional) (Array) Configures the service providers for neutron server. # This needs to be set for lbaas, vpnaas, and fwaas. # Defaults to $::os_service_default # @@ -241,7 +224,7 @@ # } # # [*auth_strategy*] -# (optional) The strategy to use for authentication. +# (Optional) The strategy to use for authentication. # Defaults to 'keystone' # # [*enable_proxy_headers_parsing*] @@ -250,16 +233,9 @@ # Defaults to $::os_service_default. # # [*ovs_integration_bridge*] -# (optional) Name of Open vSwitch bridge to use +# (Optional) Name of Open vSwitch bridge to use # Defaults to $::os_service_default # -# == Deprecated -# -# [*qos_notification_drivers*] -# (deprecated) Drivers list to use to send the update notification -# Defaults to $::os_service_default. -# - class neutron::server ( $package_ensure = 'present', $enabled = true, @@ -302,13 +278,6 @@ class neutron::server ( $auth_strategy = 'keystone', $enable_proxy_headers_parsing = $::os_service_default, $ovs_integration_bridge = $::os_service_default, - # DEPRECATED PARAMETERS - $log_dir = undef, - $log_file = undef, - $report_interval = undef, - $state_path = undef, - $lock_path = undef, - $qos_notification_drivers = $::os_service_default, ) inherits ::neutron::params { include ::neutron::deps @@ -390,36 +359,6 @@ class neutron::server ( 'service_providers/service_provider': value => $service_providers; } - if $state_path { - # If we got state_path here, display deprecation warning and override the value from - # the base class. This preserves the behavior of before state_path was deprecated. - - warning('The state_path parameter is deprecated. Use the state_path parameter on the base neutron class instead.') - - Neutron_config <| title == 'DEFAULT/state_path' |> { - value => $state_path, - } - } - - if $lock_path { - # If we got lock_path here, display deprecation warning and override the value from - # the base class. This preserves the behavior of before lock_path was deprecated. - - warning('The lock_path parameter is deprecated. Use the lock_path parameter on the base neutron class instead.') - - Neutron_config <| title == 'oslo_concurrency/lock_path' |> { - value => $lock_path, - } - } - - if !is_service_default($qos_notification_drivers) { - deprecation('qos_notification_drivers', 'The qos configuration option \ -notification_drivers is deprecated in ocata release, and will be removed in a \ -future release') - } - - neutron_config { 'qos/notification_drivers': value => join(any2array($qos_notification_drivers), ',') } - if $server_package { package { 'neutron-server': ensure => $package_ensure, diff --git a/manifests/server/notifications.pp b/manifests/server/notifications.pp index e50ff4deb..f7161d5fc 100644 --- a/manifests/server/notifications.pp +++ b/manifests/server/notifications.pp @@ -86,14 +86,6 @@ # the keystone catalog. # Defaults to $::os_service_default # -# === Deprecated Parameters -# -# [*auth_plugin*] -# Deprecated. auth_type should be used instead -# An authentication plugin to use with an OpenStack Identity server. -# Defaults to $::os_service_default -# - class neutron::server::notifications ( $password, $notify_nova_on_port_status_changes = true, @@ -111,8 +103,6 @@ class neutron::server::notifications ( $auth_url = 'http://127.0.0.1:35357', $region_name = $::os_service_default, $endpoint_type = $::os_service_default, - # DEPRECATED PARAMETERS - $auth_plugin = $::os_service_default, ) { include ::neutron::deps @@ -132,16 +122,7 @@ class neutron::server::notifications ( 'nova/user_domain_name': value => $user_domain_name; 'nova/region_name': value => $region_name; 'nova/endpoint_type': value => $endpoint_type; - } - if ! is_service_default ($auth_plugin) and ($auth_plugin) { - warning('auth_plugin parameter is deprecated, auth_type should be used instead') - neutron_config { - 'nova/auth_plugin': value => $auth_plugin; - } - } else { - neutron_config { - 'nova/auth_type': value => $auth_type; - } + 'nova/auth_type': value => $auth_type; } if ! is_service_default ($tenant_id) { if $tenant_id { diff --git a/releasenotes/notes/remove-deprecated-78a9c6eb010d5705.yaml b/releasenotes/notes/remove-deprecated-78a9c6eb010d5705.yaml new file mode 100644 index 000000000..00acfb3ab --- /dev/null +++ b/releasenotes/notes/remove-deprecated-78a9c6eb010d5705.yaml @@ -0,0 +1,37 @@ +--- +upgrade: + - | + The deprecated class neutron::plugins::ovn are now removed. + Please use the neutron::plugins::ml2::ovn class instead. + - | + The deprecated parameter neutron::quota::quota_health_monitor + are removed. Please use the quota_healthmonitor parameter instead. + - | + The deprecated parameters log_dir, log_file, state_path and lock_path + in neutron::server are removed. Please use these parameter in the ::neutron + class instead. + - | + The deprecated parameter report_interval in neutron::server are removed. + This parameter does not have any effect for neutron-server. Please configure + it in the ::neutron class for agents. + - | + The deprecated parameter neutron::server::qos_notification_driver are now removed. + - | + The deprecated parameter neutron::server::notifications::auth_plugin are removed. + Please use the auth_type parameter instead. + - | + The deprecated parameters neutron::rabbit_host, neutron::rabbit_hosts, neutron::rabbit_password + neutron::rabbit_port, neutron::rabbit_user, neutron::rabbit_virtual_host and neutron::rpc_backend + are now removed. Please use neutron::default_transport_url instead. + - | + The deprecated parameter enable_tunneling in neutron::agents::ml2::ovs are now removed. + Please set tunnel_types to an array with desired types instead. + - | + The deprecated parameters enabled and manage_serivce in neutron::agents::vpnaas are now removed. + - | + The deprecated parameter send_arp_for_ha in neutron::agents::l3 are now removed. + - | + The deprecated parameter dhcp_domain in neutron::agents::dhcp are now removed. + Please use the neutron::dns_domain parameter instead. + - | + The deprecated parameter supported_pci_vendor_devs in neutron::plugins::ml2 are now removed. diff --git a/spec/classes/neutron_agents_dhcp_spec.rb b/spec/classes/neutron_agents_dhcp_spec.rb index 965f31fe8..721d6661f 100644 --- a/spec/classes/neutron_agents_dhcp_spec.rb +++ b/spec/classes/neutron_agents_dhcp_spec.rb @@ -40,7 +40,6 @@ describe 'neutron::agents::dhcp' do is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/state_path').with_value(p[:state_path]); is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/resync_interval').with_value(p[:resync_interval]); is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]); - is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_domain').with_value(''); is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_driver').with_value(''); is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/root_helper').with_value(p[:root_helper]); is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/enable_isolated_metadata').with_value(p[:enable_isolated_metadata]); diff --git a/spec/classes/neutron_agents_l3_spec.rb b/spec/classes/neutron_agents_l3_spec.rb index b819a6fff..9bf95c5b0 100644 --- a/spec/classes/neutron_agents_l3_spec.rb +++ b/spec/classes/neutron_agents_l3_spec.rb @@ -40,7 +40,6 @@ describe 'neutron::agents::l3' do is_expected.to contain_neutron_l3_agent_config('DEFAULT/gateway_external_network_id').with_value('') is_expected.to contain_neutron_l3_agent_config('DEFAULT/handle_internal_only_routers').with_value('') is_expected.to contain_neutron_l3_agent_config('DEFAULT/metadata_port').with_value('') - is_expected.to contain_neutron_l3_agent_config('DEFAULT/send_arp_for_ha').with_value('') is_expected.to contain_neutron_l3_agent_config('DEFAULT/periodic_interval').with_value('') is_expected.to contain_neutron_l3_agent_config('DEFAULT/periodic_fuzzy_delay').with_value('') is_expected.to contain_neutron_l3_agent_config('DEFAULT/enable_metadata_proxy').with_value('') diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb index 17df9bde7..d4fb89043 100644 --- a/spec/classes/neutron_init_spec.rb +++ b/spec/classes/neutron_init_spec.rb @@ -18,42 +18,7 @@ describe 'neutron' do end shared_examples_for 'neutron' do - - context 'and if rabbit_host parameter is provided' do - it_configures 'a neutron base installation' - end - - context 'and if rabbit_hosts parameter is provided' do - - context 'with one server' do - it_configures 'a neutron base installation' - it_configures 'rabbit HA with a single virtual host' - end - - context 'with multiple servers' do - it_configures 'a neutron base installation' - it_configures 'rabbit HA with multiple hosts' - end - - context 'with rabbit_ha_queues set to false and with rabbit_hosts' do - before { params.merge!( :rabbit_ha_queues => 'false' ) } - it_configures 'rabbit_ha_queues set to false' - end - - context 'with non-default notification options' do - before { params.merge!( :notification_driver => 'messagingv2', - :notification_topics => 'notifications', - :notification_transport_url => 'rabbit://me:passwd@host:5672/virtual_host' ) } - it_configures 'notification_driver and notification_topics' - end - - it 'configures logging' do - is_expected.to contain_oslo__log('neutron_config').with(:log_file => '', - :log_dir => params[:log_dir], - :use_stderr => '') - end - - end + it_configures 'a neutron base installation' context 'with rabbitmq heartbeat configured' do before { params.merge!( :rabbit_heartbeat_timeout_threshold => '60', :rabbit_heartbeat_rate => '10' ) } @@ -118,7 +83,7 @@ describe 'neutron' do is_expected.to contain_neutron_config('oslo_messaging_notifications/transport_url').with_value('') end - it 'configures credentials for rabbit' do + it 'configures rabbit' do is_expected.to contain_neutron_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('') is_expected.to contain_neutron_config('oslo_messaging_rabbit/heartbeat_rate').with_value('') is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value( '' ) @@ -153,23 +118,6 @@ describe 'neutron' do end end - shared_examples_for 'rabbit HA with a single virtual host' do - it 'in neutron.conf' do - is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('') - end - end - - shared_examples_for 'rabbit HA with multiple hosts' do - before do - params.merge!( - :rabbit_ha_queues => true, - ) - end - it 'in neutron.conf' do - is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true) - end - end - shared_examples_for 'rabbit with heartbeat configured' do it 'in neutron.conf' do is_expected.to contain_neutron_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('60') diff --git a/spec/classes/neutron_server_notifications_spec.rb b/spec/classes/neutron_server_notifications_spec.rb index 0742aaf0a..41b627c76 100644 --- a/spec/classes/neutron_server_notifications_spec.rb +++ b/spec/classes/neutron_server_notifications_spec.rb @@ -58,7 +58,6 @@ describe 'neutron::server::notifications' do is_expected.to contain_neutron_config('nova/user_domain_id').with_value('default') is_expected.to contain_neutron_config('nova/user_domain_name').with_value('Default') is_expected.to contain_neutron_config('nova/endpoint_type').with_value('') - is_expected.not_to contain_neutron_config('nova/auth_plugin') end context 'when overriding parameters' do @@ -98,18 +97,6 @@ describe 'neutron::server::notifications' do end end - context 'when auth_plugin is provided' do - before :each do - params.merge!( - :auth_plugin => 'v3password', - ) - end - it 'should configure auth_plugin for nova notifications' do - is_expected.to contain_neutron_config('nova/auth_plugin').with_value('v3password') - is_expected.not_to contain_neutron_config('nova/auth_type') - end - end - context 'when no tenant_id and tenant_name specified' do before :each do params.merge!({ :tenant_name => false }) diff --git a/spec/classes/neutron_server_spec.rb b/spec/classes/neutron_server_spec.rb index b2d53730b..7c7800730 100644 --- a/spec/classes/neutron_server_spec.rb +++ b/spec/classes/neutron_server_spec.rb @@ -77,7 +77,6 @@ describe 'neutron::server' do is_expected.to contain_neutron_config('DEFAULT/agent_down_time').with_value('') is_expected.to contain_neutron_config('DEFAULT/enable_new_agents').with_value('') is_expected.to contain_neutron_config('DEFAULT/router_scheduler_driver').with_value(p[:router_scheduler_driver]) - is_expected.to contain_neutron_config('qos/notification_drivers').with_value('') is_expected.to contain_oslo__middleware('neutron_config').with( :enable_proxy_headers_parsing => '', ) @@ -143,17 +142,6 @@ describe 'neutron::server' do end end - context 'with state_path and lock_path parameters' do - before :each do - params.merge!(:state_path => 'state_path', - :lock_path => 'lock_path' ) - end - it 'should override state_path and lock_path from base class' do - is_expected.to contain_neutron_config('DEFAULT/state_path').with_value(p[:state_path]) - is_expected.to contain_neutron_config('oslo_concurrency/lock_path').with_value(p[:lock_path]) - end - end - context 'with allow_automatic_l3agent_failover in neutron.conf' do it 'should configure allow_automatic_l3agent_failover' do is_expected.to contain_neutron_config('DEFAULT/allow_automatic_l3agent_failover').with_value('') @@ -166,15 +154,6 @@ describe 'neutron::server' do end end - context 'with qos_notification_drivers parameter' do - before :each do - params.merge!(:qos_notification_drivers => 'message_queue') - end - it 'should configure qos_notification_drivers' do - is_expected.to contain_neutron_config('qos/notification_drivers').with_value('message_queue') - end - end - context 'with network_auto_schedule in neutron.conf' do it 'should configure network_auto_schedule' do is_expected.to contain_neutron_config('DEFAULT/network_auto_schedule').with_value('')