From: Sergey Kolekonov <skolekonov@mirantis.com>
Date: Fri, 13 Nov 2015 10:15:02 +0000 (+0300)
Subject: Do not set service_provider in neutron.conf
X-Git-Tag: mos-9.0~8
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=069118afa81c2bab62265244c31289b54e3052c8;p=openstack-build%2Fneutron-lbaas-build.git

Do not set service_provider in neutron.conf

service_provider value is set in vpn-agent conf file, if it's set also in
Neutron conf, it prevents neutron-server from starting

Change-Id: I0ce68a999457f9bdbcb57c0c3663eab019a3c3eb
---

diff --git a/tests/runtests.sh b/tests/runtests.sh
index c433953..39b8b0e 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -139,8 +139,6 @@ auth_url=http://127.0.0.1:35357/v2.0
 root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf
 [database]
 connection = mysql://neutron:neutron@127.0.0.1/neutron?charset=utf8
-[service_providers]
-service_provider = LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
 EOF
 
 cat > /etc/neutron/lbaas_agent.ini << EOF