From fc97ff10210247ec47d79e56a9b1d7d8acc639f4 Mon Sep 17 00:00:00 2001
From: liyingjun <yingjun.li@kylin-cloud.com>
Date: Mon, 1 Aug 2016 11:48:01 +0800
Subject: [PATCH] Change config for lbaas service_plugins

Lbaasv2 is used by default, we should change service_plugins for lbaas
from 'lbaas' to
'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2'
as suggested in networking-guide:
http://docs.openstack.org/mitaka/networking-guide/adv-config-lbaas.html#configuring-lbaas-v2-with-an-agent

Change-Id: I49a24500403bd2717fcad49742830c6ceaaf210b
Closes-bug: #1608344
---
 ansible/roles/neutron/templates/neutron.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index badc2ce497..0fa7078f01 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 %},lbaas{% endif %}{% if enable_neutron_qos | bool %},qos{% 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_lbaas | bool %}
 [service_providers]