openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Fix VPNaaS variable definition for non-ubuntu"

Browse Source
This commit is contained in:
Jenkins 2017-09-14 23:34:56 +00:00 committed by Gerrit Code Review
commit e9f3f31b50
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

@ -349,6 +349,15 @@ nova_metadata_insecure: False
# Service (Optional)" for more details. # Service (Optional)" for more details.
neutron_octavia_request_poll_timeout: 100 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 ### 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_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 ## APT Cache options
cache_timeout: 600 cache_timeout: 600