From c1c28c65a54445ee27c778866ec8edcf5df367cd Mon Sep 17 00:00:00 2001 From: Jirayut Nimsaeng Date: Tue, 29 Nov 2016 00:38:42 +0700 Subject: [PATCH] Ensure correct VPNaaS package is installed 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 --- defaults/main.yml | 1 - templates/neutron.conf.j2 | 2 +- vars/ubuntu-14.04.yml | 3 +++ vars/ubuntu-16.04.yml | 5 ++++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index ec6fb5bb..f74d12db 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2 index 6b7a778a..f8639dd5 100644 --- a/templates/neutron.conf.j2 +++ b/templates/neutron.conf.j2 @@ -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 %} diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml index 99ab3e7b..fa2e7312 100644 --- a/vars/ubuntu-14.04.yml +++ b/vars/ubuntu-14.04.yml @@ -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 diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index 203271f6..753b963c 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -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