diff --git a/defaults/main.yml b/defaults/main.yml index 19ca7343..272f5d6d 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 c9c9a6f5..082dbdf2 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -94,6 +94,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 26497f4b..872d20d0 100644 --- a/vars/suse.yml +++ b/vars/suse.yml @@ -98,6 +98,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