openstack/puppet-octavia
Code Issues Proposed changes

Remove deprecated octavia::api::ovn_nb_connection

Browse Source 
... which was deprecated during the Ussuri cycle[1] in favor of the new
independent octavia::provider::ovn class.

[1] 8777b5031c

Change-Id: I171da249fbe6e372f1b5ef57e7e6f641aa13ad6b
This commit is contained in:
Takashi Kajinami 2021-11-10 08:11:43 +09:00
parent 728d549daf
commit 045272a8ce
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/api.pp
View File

@ -80,12 +80,6 @@
# (optional) The interval healthcheck plugin should cache results, in seconds. # (optional) The interval healthcheck plugin should cache results, in seconds.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# DEPRECATED PARAMETERS
#
# [*ovn_nb_connection*]
# (optional) The connection string for the OVN_Northbound OVSDB.
# Defaults to undef
#
class octavia::api ( class octavia::api (
$enabled = true, $enabled = true,
$manage_service = true, $manage_service = true,
@ -105,8 +99,6 @@ class octavia::api (
$pagination_max_limit = $::os_service_default, $pagination_max_limit = $::os_service_default,
$healthcheck_enabled = $::os_service_default, $healthcheck_enabled = $::os_service_default,
$healthcheck_refresh_interval = $::os_service_default, $healthcheck_refresh_interval = $::os_service_default,
# DEPRECATED PARAMETERS
$ovn_nb_connection = undef
) inherits octavia::params { ) inherits octavia::params {
include octavia::deps include octavia::deps
@ -117,10 +109,6 @@ class octavia::api (
include octavia::keystone::authtoken include octavia::keystone::authtoken
} }
if $ovn_nb_connection {
warning('The ovn_nb_connection parameter is deprecated from octavia::api. Use octavia::provider::ovn::ovn_nb_connection.')
}
package { 'octavia-api': package { 'octavia-api':
ensure => $package_ensure, ensure => $package_ensure,
name => $::octavia::params::api_package_name, name => $::octavia::params::api_package_name,

9
manifests/provider/ovn.pp
View File

@ -79,18 +79,11 @@ class octavia::provider::ovn (
tag => ['openstack', 'octavia-package'], tag => ['openstack', 'octavia-package'],
} }
# For backward compatibility
if $::octavia::api::ovn_nb_connection and !is_service_default($::octavia::api::ovn_nb_connection) {
$ovn_nb_connection_real = $::octavia::api::ovn_nb_connection
} else {
$ovn_nb_connection_real = $ovn_nb_connection
}
# TODO(flaviof): We need to replace octavia_config with octavia_ovn_provider_config in the future. # TODO(flaviof): We need to replace octavia_config with octavia_ovn_provider_config in the future.
# For now, the config below uses octavia_config until we can figure out how to pass extra # For now, the config below uses octavia_config until we can figure out how to pass extra
# configuration files to the api running as wsgi process. # configuration files to the api running as wsgi process.
octavia_config { octavia_config {
'ovn/ovn_nb_connection': value => $ovn_nb_connection_real; 'ovn/ovn_nb_connection': value => $ovn_nb_connection;
'ovn/ovn_nb_private_key': value => $ovn_nb_private_key; 'ovn/ovn_nb_private_key': value => $ovn_nb_private_key;
'ovn/ovn_nb_certificate': value => $ovn_nb_certificate; 'ovn/ovn_nb_certificate': value => $ovn_nb_certificate;
'ovn/ovn_nb_ca_cert': value => $ovn_nb_ca_cert; 'ovn/ovn_nb_ca_cert': value => $ovn_nb_ca_cert;

4
releasenotes/notes/remove-api-ovn_nb_connection-2d85f0ece3db7576.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``octavia::api::ovn_nb_connection`` parameter has been removed.