Deprecate all Neutron LBaaS code

The Neutron LBaaS project was deprecated in Queens and will
be removed in a future release.

Please see here for all information about the deprecation [1].

The Octavia project [2] was borne out of Neutron LBaaS and replaces
all it's functionality and currently supports integration with
Neutron LBaaS as well to allow a migration between the two solutions.

[1] https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation
[2] https://docs.openstack.org/octavia/latest/reference/introduction.html

Change-Id: Ic3899f1366cad935545e9567f774f74f228b5800
This commit is contained in:
Tobias Urdin
2018-11-07 17:17:54 +01:00
parent 14f275bc45
commit e52f5449fd
7 changed files with 50 additions and 14 deletions

View File

@@ -57,6 +57,8 @@ class neutron::agents::lbaas (
include ::neutron::deps
include ::neutron::params
warning('neutron::agents::lbaas is deprecated and will be removed in a future release')
case $device_driver {
/\.haproxy/: {
Package <| title == $::neutron::params::haproxy_package |> -> Package <| title == 'neutron-lbaasv2-agent' |>

View File

@@ -48,9 +48,6 @@
# [*dhcp_agent_config*]
# (optional) Manage configuration of dhcp_agent.ini
#
# [*lbaas_agent_config*]
# (optional) Manage configuration of lbaas_agent.ini
#
# [*metadata_agent_config*]
# (optional) Manage configuration of metadata_agent.ini
#
@@ -102,6 +99,11 @@
# NOTE: The configuration MUST NOT be already handled by this module
# or Puppet catalog compilation will fail with duplicate resources.
#
#### DEPRECATED
#
# [*lbaas_agent_config*]
# (optional) Manage configuration of lbaas_agent.ini
#
class neutron::config (
$server_config = {},
$api_config = {},
@@ -112,7 +114,6 @@ class neutron::config (
$sfc_service_config = {},
$l3_agent_config = {},
$dhcp_agent_config = {},
$lbaas_agent_config = {},
$metadata_agent_config = {},
$ovn_metadata_agent_config = {},
$metering_agent_config = {},
@@ -129,6 +130,8 @@ class neutron::config (
$plugin_ml2_config = {},
$plugin_nsx_config = {},
$plugin_nvp_config = {},
### DEPRECATED PARAMS
$lbaas_agent_config = undef,
) {
include ::neutron::deps
@@ -142,7 +145,6 @@ class neutron::config (
validate_hash($sfc_service_config)
validate_hash($l3_agent_config)
validate_hash($dhcp_agent_config)
validate_hash($lbaas_agent_config)
validate_hash($metadata_agent_config)
validate_hash($ovn_metadata_agent_config)
validate_hash($metering_agent_config)
@@ -160,6 +162,13 @@ class neutron::config (
validate_hash($plugin_nsx_config)
validate_hash($plugin_nvp_config)
if $lbaas_agent_config {
validate_hash($lbaas_agent_config)
warning('neutron::config::lbaas_agent_config is deprecated and will be removed in a future release')
create_resources('neutron_lbaas_agent_config', $lbaas_agent_config)
}
create_resources('neutron_config', $server_config)
create_resources('neutron_api_config', $api_config)
create_resources('neutron_bgpvpn_bagpipe_config', $bgpvpn_bagpipe_config)
@@ -168,7 +177,6 @@ class neutron::config (
create_resources('neutron_sfc_service_config', $sfc_service_config)
create_resources('neutron_l3_agent_config', $l3_agent_config)
create_resources('neutron_dhcp_agent_config', $dhcp_agent_config)
create_resources('neutron_lbaas_agent_config', $lbaas_agent_config)
create_resources('neutron_metadata_agent_config', $metadata_agent_config)
create_resources('neutron_metering_agent_config', $metering_agent_config)
create_resources('neutron_vpnaas_agent_config', $vpnaas_agent_config)

View File

@@ -192,11 +192,6 @@
# (Optional) Allow auto scheduling networks to DHCP agent
# Defaults to $::os_service_default.
#
# [*ensure_lbaas_package*]
# (Optional) Ensures installation of LBaaS package before starting API service.
# Set to true to ensure installation of the package that is required to start neutron service if lbaasv2 service_plugin is enabled.
# Defaults to false.
#
# [*ensure_vpnaas_package*]
# (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.
@@ -246,6 +241,13 @@
# (Optional) Name of Open vSwitch bridge to use
# Defaults to $::os_service_default
#
### DEPRECATED PARAMS
#
# [*ensure_lbaas_package*]
# (Optional) Ensures installation of LBaaS package before starting API service.
# Set to true to ensure installation of the package that is required to start neutron service if lbaasv2 service_plugin is enabled.
# Defaults to false.
#
class neutron::server (
$package_ensure = 'present',
$enabled = true,
@@ -281,7 +283,6 @@ class neutron::server (
$max_l3_agents_per_router = 3,
$l3_ha_net_cidr = $::os_service_default,
$network_auto_schedule = $::os_service_default,
$ensure_lbaas_package = false,
$ensure_vpnaas_package = false,
$ensure_fwaas_package = false,
$ensure_dr_package = false,
@@ -290,6 +291,8 @@ class neutron::server (
$auth_strategy = 'keystone',
$enable_proxy_headers_parsing = $::os_service_default,
$ovs_integration_bridge = $::os_service_default,
### DEPRECATED PARAMS
$ensure_lbaas_package = false,
) inherits ::neutron::params {
include ::neutron::deps
@@ -339,6 +342,8 @@ class neutron::server (
}
if $ensure_lbaas_package {
warning('neutron::server::ensure_lbaas_package is deprecated and will be removed in a future release')
if $::neutron::params::lbaas_package {
ensure_packages('neutron-lbaas', {
ensure => $package_ensure,

View File

@@ -51,8 +51,7 @@ class neutron::services::lbaas (
$ensure_lbaas_driver_package = 'present',
) {
warning('neutron::services::lbaas class is deprecated, please use \
neutron::server::ensure_lbaas_package and neutron::server::service_provider')
warning('neutron::services::lbaas class is deprecated and will be removed in a future release.')
include ::neutron::deps
include ::neutron::params

View File

@@ -59,6 +59,8 @@ class neutron::services::lbaas::haproxy(
include ::neutron::deps
warning('neutron::services::lbaas::haproxy is deprecated and will be removed in a future release')
neutron_config {
'haproxy/interface_driver': value => $interface_driver;
'haproxy/periodic_interval': value => $periodic_interval;

View File

@@ -94,6 +94,8 @@ class neutron::services::lbaas::octavia(
include ::neutron::deps
warning('neutron::services::lbaas::octavia is deprecated and will be removed in a future release')
neutron_config {
'octavia/base_url': value => $base_url;
'octavia/request_poll_interval': value => $request_poll_interval;

View File

@@ -0,0 +1,18 @@
---
deprecations:
- |
Neutron LBaaS is deprecated since Queens so all the following resources
and parameters are deprecated and will be removed in a future release:
- ``neutron::agents::lbaas``
- ``neutron::config::lbaas_agent_config``
- ``neutron::server::ensure_lbaas_package``
- ``neutron::services::lbaas``
- ``neutron::services::lbaas::haproxy``
- ``neutron::services::lbaas::octavia``
Please see the following link for more information on this deprecation:
https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation
You should use the Octavia project to implement LBaaS.
https://docs.openstack.org/octavia/latest/reference/introduction.html