openstack/puppet-neutron
Code Issues Proposed changes

vpnaas: Fix outdated default vpn_device_driver

Browse Source 
The current default is no longer valid since VPNaaS functionality was
split out to the separate neutron-vpnaas package.

Closes-Bug: #2041482
Change-Id: I83a5aefebf4f026bf327f4fb3341ba0acbd9ad48
This commit is contained in:
Takashi Kajinami 2023-10-27 10:15:40 +09:00
parent 5078eb55e1
commit 9b0bffdfb1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/agents/vpnaas.pp
View File

@ -25,7 +25,8 @@
# (optional) Ensure state for package. Defaults to 'present'.
#
# [*vpn_device_driver*]
# (optional) Defaults to 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver'.
# (optional) The vpn device drivers Neutron will us.
# Defaults to 'neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver'.
#
# [*interface_driver*]
# (optional) The driver used to manage the virtual interface.
@ -41,7 +42,7 @@
#
class neutron::agents::vpnaas (
$package_ensure = present,
$vpn_device_driver = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver',
$vpn_device_driver = 'neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver',
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$ipsec_status_check_interval = $facts['os_service_default'],
Boolean $purge_config = false,

2
spec/classes/neutron_agents_vpnaas_spec.rb
View File

@ -32,7 +32,7 @@ describe 'neutron::agents::vpnaas' do
let :default_params do
{
:package_ensure => 'present',
:vpn_device_driver => 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver',
:vpn_device_driver => 'neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver',
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:purge_config => false,
}