From ea60f9655c97ba0e9cf03862d0dfac86d4497e73 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 13 Jan 2020 18:44:11 +0200 Subject: [PATCH] Use appropriate vpnaas drivers Drivers, used for Ubuntu/CentOS vpnaas differs and appropriate ones should be used by default. Currently vpnaas installation for CentOS and Suse is not working due to configuring incorrect driver. Change-Id: Ief5d89397611bb702925c7e3ac972b70e424a3a1 (cherry picked from commit a7a64f3baf6cb399dc38e0758df212cd07f770b6) --- defaults/main.yml | 4 ++-- vars/debian.yml | 3 +++ vars/redhat.yml | 3 +++ vars/suse.yml | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 43612f7f..a96e9a33 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -426,8 +426,8 @@ neutron_fwaasv2_service_provider: FIREWALL_V2:fwaas_db:neutron_fwaas.services.fi # 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 +neutron_driver_vpnaas: "{{ _neutron_driver_vpnaas }}" +neutron_vpnaas_service_provider: "{{ _neutron_vpnaas_service_provider }}" # neutron_management_ip is used to configure the location (IP) of the # neutron-server diff --git a/vars/debian.yml b/vars/debian.yml index aafa4731..ed7756ef 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -88,6 +88,9 @@ neutron_lxb_distro_packages: neutron_vpnaas_distro_packages: - strongswan +_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 + neutron_metadata_agent_distro_packages: - haproxy diff --git a/vars/redhat.yml b/vars/redhat.yml index 9759ce82..1005f5cc 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -77,6 +77,9 @@ neutron_lxb_distro_packages: neutron_vpnaas_distro_packages: - openswan +_neutron_driver_vpnaas: neutron_vpnaas.services.vpn.device_drivers.libreswan_ipsec.LibreSwanDriver +_neutron_vpnaas_service_provider: VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default + neutron_metadata_agent_distro_packages: - haproxy diff --git a/vars/suse.yml b/vars/suse.yml index 79b41de2..a29ca06e 100644 --- a/vars/suse.yml +++ b/vars/suse.yml @@ -95,6 +95,9 @@ neutron_lxb_distro_packages: neutron_vpnaas_distro_packages: - openswan +_neutron_driver_vpnaas: neutron_vpnaas.services.vpn.device_drivers.libreswan_ipsec.LibreSwanDriver +_neutron_vpnaas_service_provider: VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default + neutron_metadata_agent_distro_packages: - haproxy