diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-19 08:45:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-19 08:45:13 +0000 |
| commit | 25f2eb62f01a9fcf0d5706257a339760c8e5e1d9 (patch) | |
| tree | 6749c3963b8e054fe0ff2ea53454dbedc3f52de0 /ansible | |
| parent | 42358d359b1e0c939f3f16cc0eb894b63e899d1f (diff) | |
| parent | 0a024d9d7abe23791edd5b76a36bd5dff53064c3 (diff) | |
| download | kolla-25f2eb62f01a9fcf0d5706257a339760c8e5e1d9.tar.gz kolla-25f2eb62f01a9fcf0d5706257a339760c8e5e1d9.zip | |
Merge "Fix vpnaas for neutron"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/neutron/templates/neutron.conf.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index 99b2a7295..51e6ca2de 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -35,7 +35,7 @@ host = {{ ansible_hostname }}_{{ item }} allow_overlapping_ips = true 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 %} dhcp_agents_per_network = {{ dhcp_agents_per_network }} |