Merge "Correct Neutron VPNaaS service_provider config entry"

This commit is contained in:
Jenkins 2016-04-20 13:52:12 +00:00 committed by Gerrit Code Review
commit b6d965c631

View File

@ -164,7 +164,7 @@ service_provider = LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.driv
service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
{% endif %} {% endif %}
{% if neutron_vpnaas| bool %} {% if neutron_vpnaas| bool %}
service_provider = VPN:openswan:neutron.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default service_provider = VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
{% endif %} {% endif %}
{% endif %} {% endif %}