openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix vpnaas for neutron"

Browse Source
This commit is contained in:
Jenkins 2016-09-19 08:45:13 +00:00 committed by Gerrit Code Review
commit 25f2eb62f0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -35,7 +35,7 @@ host = {{ ansible_hostname }}_{{ item }}
allow_overlapping_ips = true allow_overlapping_ips = true
core_plugin = ml2 core_plugin = ml2
service_plugins = router{% if enable_neutron_lbaas | bool %},neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2{% endif %}{% if enable_neutron_qos | bool %},qos{% endif %}{% if enable_neutron_vpnaas | bool %},vpnass{% endif %}{% if neutron_plugin_agent == "sfc" %}flow_classifier,sfc{% endif %} service_plugins = router{% if enable_neutron_lbaas | bool %},neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2{% endif %}{% if enable_neutron_qos | bool %},qos{% endif %}{% if enable_neutron_vpnaas | bool %},neutron_vpnaas.services.vpn.plugin.VPNDriverPlugin{% endif %}{% if neutron_plugin_agent == "sfc" %}flow_classifier,sfc{% endif %}
{% if enable_neutron_agent_ha | bool %} {% if enable_neutron_agent_ha | bool %}
dhcp_agents_per_network = {{ dhcp_agents_per_network }} dhcp_agents_per_network = {{ dhcp_agents_per_network }}

7
docker/neutron/neutron-server/Dockerfile.j2
View File

@ -9,15 +9,16 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set neutron_server_packages = [ {% set neutron_server_packages = [
'openstack-neutron-lbaas' 'openstack-neutron-lbaas',
'openstack-neutron-vpnaas',
] %} ] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set neutron_server_packages = [ {% set neutron_server_packages = [
'neutron-lbaas-common',
'neutron-lbaasv2-agent', 'neutron-lbaasv2-agent',
'python-neutron-lbaas' 'python-neutron-lbaas',
'python-neutron-vpnaas',
] %} ] %}
{% endif %} {% endif %}