openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Ensure correct VPNaaS package is installed

Browse Source 
Trusty uses `openswan` and Xenial uses `strongswan`. This patch
ensures that the correct packages are installed in each distro
if the deployer chooses to deploy VPNaaS.

Change-Id: Iab6ed9cb24e07005cf6334253677689b68e344a5
Closes-Bug: #1645396
This commit is contained in:
Jirayut Nimsaeng 2016-11-29 00:38:42 +07:00 committed by Major Hayden
parent 96ea32facf
commit c1c28c65a5
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -347,7 +347,6 @@ neutron_driver_loadbalancer_pool_scheduler: neutron_lbaas.services.loadbalancer.
neutron_driver_metering: neutron.services.metering.drivers.iptables.iptables_driver.IptablesMeteringDriver
neutron_driver_dhcp: neutron.agent.linux.dhcp.Dnsmasq
neutron_driver_quota: neutron.db.quota.driver.DbQuotaDriver
neutron_driver_vpnaas: neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver
## Quotas

2
templates/neutron.conf.j2
View File

@ -158,7 +158,7 @@ pool_timeout = {{ neutron_db_pool_timeout }}
service_provider = {{ neutron_lbaasv2_service_provider }}
{% endif %}
{% if neutron_vpnaas| bool %}
service_provider = VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
service_provider = {{ neutron_vpnaas_service_provider }}
{% endif %}
{% endif %}

3
vars/ubuntu-14.04.yml
View File

@ -24,6 +24,9 @@ neutron_ovs_distro_packages:
- openvswitch-common
- openvswitch-switch
neutron_driver_vpnaas: neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver
neutron_vpnaas_service_provider: VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
## APT Cache options
cache_timeout: 600

5
vars/ubuntu-16.04.yml
View File

@ -22,6 +22,9 @@ neutron_ovs_distro_packages:
- openvswitch-common
- 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
@ -43,7 +46,7 @@ neutron_lbaas_distro_packages:
- haproxy
neutron_vpnaas_distro_packages:
- openswan
- strongswan
neutron_remove_distro_packages:
- conntrackd