openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Fix VPNaaS variable definition for non-ubuntu

Browse Source 
VPNaaS variables are defined for ubuntu, but not the other
distros.

One choice was to move these vars into vars/main.yml, but
would have prevented the easy overriding of it.
Because it's a driver, there are chances that someone wants
to override it, so it should be in defaults.

Closes-Bug: #1711577

Change-Id: I843e950e5c668da88500d60cf87bb9d19246262d
This commit is contained in:
Jean-Philippe Evrard 2017-08-10 13:06:20 +01:00 committed by Jean-Philippe Evrard
parent e56ae0fc59
commit de53748373
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
defaults/main.yml
View File

@ -341,6 +341,15 @@ neutron_metadata_checksum_fix: False
# Service (Optional)" for more details.
neutron_octavia_request_poll_timeout: 100
###
### VPNaaS Configuration
###
# See VPNaaS documentation for driver/service provider selection
# in case you want to override it.
neutron_driver_vpnaas: neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
neutron_vpnaas_service_provider: VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
###
### Dragonflow Configuration
###

3
vars/ubuntu-16.04.yml
View File

@ -21,9 +21,6 @@ neutron_ovs_distro_packages:
neutron_ovs_service_name: openvswitch-switch
neutron_driver_vpnaas: neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
neutron_vpnaas_service_provider: VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
## APT Cache options
cache_timeout: 600