openstack/puppet-neutron
Code Issues Proposed changes

Deprecate neutron::ensure_vpnaas_package

Browse Source 
... because the parameter is duplicate of the neutron::services::vpnaas
class.

Change-Id: Ib3acfc8f22fe3be5ab8daf2186ce366522d07e10
This commit is contained in:
Takashi Kajinami 2023-11-12 21:48:32 +09:00
parent ba6d1045a7
commit e41e9ae081
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/server.pp
View File

@ -178,11 +178,6 @@
# (Optional) Allow auto scheduling networks to DHCP agent
# Defaults to $facts['os_service_default'].
#
# [*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.
# Defaults to false.
#
# [*ensure_dr_package*]
# (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.
@ -235,6 +230,14 @@
# mechanism driver for Neutron.
# Defaults to $facts['os_service_default']
#
# DEPRECATED PARAMETERS
#
# [*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.
# Defaults to false.
#
class neutron::server (
$package_ensure = 'present',
Boolean $enabled = true,
@ -266,7 +269,6 @@ class neutron::server (
$l3_ha_network_type = $facts['os_service_default'],
$l3_ha_network_physical_name = $facts['os_service_default'],
$network_auto_schedule = $facts['os_service_default'],
Boolean $ensure_vpnaas_package = false,
Boolean $ensure_dr_package = false,
$vpnaas_agent_package = false,
$service_providers = $facts['os_service_default'],
@ -275,6 +277,8 @@ class neutron::server (
$max_request_body_size = $facts['os_service_default'],
$ovs_integration_bridge = $facts['os_service_default'],
$igmp_snooping_enable = $facts['os_service_default'],
# DEPRECATED PARAMETERS
Boolean $ensure_vpnaas_package = false,
) inherits neutron::params {
include neutron::deps
@ -288,6 +292,8 @@ class neutron::server (
}
if $ensure_vpnaas_package {
warning("The ensure_vpnaas_package parameter has been deprecated. Use \
the neutron::services::vpnaas class.")
ensure_packages( 'neutron-vpnaas-agent', {
'ensure' => $package_ensure,
'name' => $::neutron::params::vpnaas_agent_package,

5
releasenotes/notes/deprecate-ensure_vpnaas_package-93ab950d9fdbc7a4.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``neutron::server::ensure_vpnaas_package`` parameter has been
deprecated, in favor of the new ``neutron::services::vpnaas`` class.