Deprecated neutron fwaas

The neutron fwaas project is being retired [1], this deprecates
all related code so it can be removed next release.

[1] https://review.opendev.org/#/c/735829/

Depends-On: https://review.opendev.org/#/c/736722/
Change-Id: I58b79942dc49d27e3ef6a35f3970fc392849652e
This commit is contained in:
Tobias Urdin 2020-06-18 17:43:40 +02:00
parent bd0fe20af9
commit 80f2b44bcb
5 changed files with 25 additions and 7 deletions

View File

@ -1,3 +1,4 @@
# DEPRECATED!
Puppet::Type.type(:neutron_fwaas_service_config).provide( Puppet::Type.type(:neutron_fwaas_service_config).provide(
:ini_setting, :ini_setting,
:parent => Puppet::Type.type(:openstack_config).provider(:ini_setting) :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting)

View File

@ -1,3 +1,4 @@
# DEPRECATED!
Puppet::Type.newtype(:neutron_fwaas_service_config) do Puppet::Type.newtype(:neutron_fwaas_service_config) do
ensurable ensurable

View File

@ -173,11 +173,6 @@
# Set to true to ensure installation of the package that is required to start neutron service if service_plugin is enabled. # Set to true to ensure installation of the package that is required to start neutron service if service_plugin is enabled.
# Defaults to false. # Defaults to false.
# #
# [*ensure_fwaas_package*]
# (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.
#
# [*ensure_dr_package*] # [*ensure_dr_package*]
# (Optional) Ensures installation of Neutron Dynamic Routing package before starting API service. # (Optional) Ensures installation of Neutron Dynamic Routing package before starting API service.
# Set to true to ensure installation of the package that is required to start neutron service if bgp service_plugin is enabled. # Set to true to ensure installation of the package that is required to start neutron service if bgp service_plugin is enabled.
@ -191,7 +186,6 @@
# #
# [*service_providers*] # [*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 vpnaas, fwaas etc.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# Example: # Example:
@ -261,6 +255,11 @@
# (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. # Defaults to: undef.
# #
# [*ensure_fwaas_package*]
# (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 undef.
#
class neutron::server ( class neutron::server (
$package_ensure = 'present', $package_ensure = 'present',
$enabled = true, $enabled = true,
@ -291,7 +290,6 @@ class neutron::server (
$l3_ha_net_cidr = $::os_service_default, $l3_ha_net_cidr = $::os_service_default,
$network_auto_schedule = $::os_service_default, $network_auto_schedule = $::os_service_default,
$ensure_vpnaas_package = false, $ensure_vpnaas_package = false,
$ensure_fwaas_package = false,
$ensure_dr_package = false, $ensure_dr_package = false,
$vpnaas_agent_package = false, $vpnaas_agent_package = false,
$service_providers = $::os_service_default, $service_providers = $::os_service_default,
@ -308,6 +306,7 @@ class neutron::server (
$database_retry_interval = undef, $database_retry_interval = undef,
$database_max_pool_size = undef, $database_max_pool_size = undef,
$database_max_overflow = undef, $database_max_overflow = undef,
$ensure_fwaas_package = undef,
) inherits ::neutron::params { ) inherits ::neutron::params {
include neutron::deps include neutron::deps
@ -330,6 +329,8 @@ class neutron::server (
} }
if $ensure_fwaas_package { if $ensure_fwaas_package {
warning('neutron::server::ensure_fwaas_package is deprecated and will be removed in a future release')
if ($::osfamily == 'Debian') { if ($::osfamily == 'Debian') {
# Debian platforms # Debian platforms
if $vpnaas_agent_package { if $vpnaas_agent_package {

View File

@ -16,6 +16,8 @@
# under the License. # under the License.
# #
# #
# DEPRECATED!!!
#
# == Class: neutron::services::fwaas # == Class: neutron::services::fwaas
# #
# Configure the Firewall as a Service Neutron Plugin # Configure the Firewall as a Service Neutron Plugin
@ -57,6 +59,8 @@ class neutron::services::fwaas (
include neutron::deps include neutron::deps
include neutron::params include neutron::params
warning('neutron::services:fwaas is deprecated and will be removed in a future release.')
if ($::osfamily == 'Debian') { if ($::osfamily == 'Debian') {
# Debian platforms # Debian platforms
if $vpnaas_agent_package { if $vpnaas_agent_package {

View File

@ -0,0 +1,11 @@
---
deprecations:
- |
The neutron::server::ensure_fwaas_package is deprecated and will be removed
in a future release.
- |
The neutron::services::fwaas class is deprecated and will be removed in
a future release.
- |
The neutron_fwaas_service_config resource is deprecated and will be removed
in a future release.