openstack/puppet-neutron
Code Issues Proposed changes

Merge "vpnaas: Fix outdated default vpn_device_driver"

Browse Source
This commit is contained in:
Zuul 2023-10-30 16:11:07 +00:00 committed by Gerrit Code Review
commit ef0137f4a7
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'. # (optional) Ensure state for package. Defaults to 'present'.
# #
# [*vpn_device_driver*] # [*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*] # [*interface_driver*]
# (optional) The driver used to manage the virtual interface. # (optional) The driver used to manage the virtual interface.
@ -41,7 +42,7 @@
# #
class neutron::agents::vpnaas ( class neutron::agents::vpnaas (
$package_ensure = present, $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', $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$ipsec_status_check_interval = $facts['os_service_default'], $ipsec_status_check_interval = $facts['os_service_default'],
Boolean $purge_config = false, 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 let :default_params do
{ {
:package_ensure => 'present', :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', :interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:purge_config => false, :purge_config => false,
} }