openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix neutron-vpnaas for redhat derived bases"

Browse Source
This commit is contained in:
Jenkins 2016-12-09 19:44:46 +00:00 committed by Gerrit Code Review
commit 67ae89dec7
2 changed files with 2 additions and 1 deletions
ansible/roles/neutron
tasks
start.yml
templates
vpnaas_agent.ini.j2

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

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

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

@ -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]
[ipsec]