openstack/kolla-ansible
Code Issues Proposed changes

Fix neutron-vpnaas for redhat derived bases

Browse Source 
The current redhat derived bases that Kolla ships use libreswan instead
of openswan (even running 'yum install openswan' on these bases results
in libreswan being installed).

This means we need to use this device_driver in vpnaas_agent.ini. Also
/lib/modules is required from the host for the ipsec driver.

Change-Id: I94480cda06718ab4aa10250520fa58956151e33a
Closes-Bug: #1644518
This commit is contained in:
Paul Bourke 2016-11-24 11:18:54 +00:00
parent cf81e153cb
commit 8c1ddaaa19
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/neutron/tasks/start.yml
View File

@ -295,6 +295,7 @@
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/run:/run:shared" - "/run:/run:shared"
- "/run/netns/:/run/netns/:shared" - "/run/netns/:/run/netns/:shared"
- "/lib/modules:/lib/modules:ro"
- "neutron_metadata_socket:/var/lib/neutron/kolla/" - "neutron_metadata_socket:/var/lib/neutron/kolla/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: when:

2
ansible/roles/neutron/templates/vpnaas_agent.ini.j2
View File

@ -1,4 +1,4 @@
{% set vpn_device_driver = 'neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver' if kolla_base_distro in ['ubuntu', 'debian'] else 'neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver'%} {% set vpn_device_driver = 'neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver' if kolla_base_distro in ['ubuntu', 'debian'] else 'neutron_vpnaas.services.vpn.device_drivers.libreswan_ipsec.LibreSwanDriver'%}
[DEFAULT] [DEFAULT]
[ipsec] [ipsec]