openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "vpnaas: Do not install wrong backend package for OpenSwan driver"

This commit is contained in:
Zuul 2023-11-08 10:17:36 +00:00 committed by Gerrit Code Review
parent cc7fec0be0 dfc70104d1
commit 8d1d120b71
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/agents/vpnaas.pp
View File

@ -53,12 +53,8 @@ class neutron::agents::vpnaas (
case $vpn_device_driver {
/\.OpenSwan/: {
Package['openswan'] -> Package<| title == 'neutron-vpnaas-agent' |>
package { 'openswan':
ensure => present,
name => $::neutron::params::openswan_package,
tag => ['openstack', 'neutron-support-package'],
}
warning("Support for OpenSwan has been deprecated, because of lack of \
openswan package in distributions")
}
/\.LibreSwan/: {
Package['libreswan'] -> Package<| title == 'neutron-vpnaas-agent' |>

2
manifests/params.pp
View File

@ -54,7 +54,6 @@ class neutron::params {
$ovn_agent_package = 'openstack-neutron-ovn-agent'
$dynamic_routing_package = 'python3-neutron-dynamic-routing'
$bgp_dragent_package = 'openstack-neutron-bgp-dragent'
$openswan_package = 'libreswan'
$libreswan_package = 'libreswan'
$strongswan_package = 'strongswan'
$metadata_agent_package = false
@ -101,7 +100,6 @@ class neutron::params {
$dhcp_agent_package = 'neutron-dhcp-agent'
$metering_agent_package = 'neutron-metering-agent'
$vpnaas_agent_package = 'python3-neutron-vpnaas'
$openswan_package = 'strongswan'
$libreswan_package = 'libreswan'
$strongswan_package = 'strongswan'
$metadata_agent_package = 'neutron-metadata-agent'

4
releasenotes/notes/deprecate-vpnaas-openswan-driver-299a9173641152c2.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- |
Support for OpenSwan VPNaaS driver has been derecated.

10
spec/classes/neutron_agents_vpnaas_spec.rb
View File

@ -48,14 +48,6 @@ describe 'neutron::agents::vpnaas' do
:tag => ['openstack', 'neutron-package'],
)
end
it 'installs openswan packages' do
should contain_package('openswan').with(
:ensure => 'present',
:name => platform_params[:openswan_package],
:tag => ['openstack', 'neutron-support-package'],
)
end
end
context 'with libreswan vpnaas driver' do
@ -113,14 +105,12 @@ describe 'neutron::agents::vpnaas' do
case facts[:os]['family']
when 'Debian'
{
:openswan_package => 'strongswan',
:libreswan_package => 'libreswan',
:strongswan_package => 'strongswan',
:vpnaas_agent_package => 'python3-neutron-vpnaas'
}
when 'RedHat'
{
:openswan_package => 'libreswan',
:libreswan_package => 'libreswan',
:strongswan_package => 'strongswan',
:vpnaas_agent_package => 'openstack-neutron-vpnaas'