From: Eugene Nikanorov <enikanorov@mirantis.com>
Date: Thu, 13 Jun 2013 18:54:59 +0000 (+0400)
Subject: Rename agent_loadbalancer directory to loadbalancer
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=358975281f7d9ef43f16febaf27f8f5d1d568426;p=openstack-build%2Fneutron-build.git

Rename agent_loadbalancer directory to loadbalancer

Fix missing path changes

Fixes bug 1179276

Change-Id: I889eeac8013de67fccbac9bfa745a56e7f859756
---

diff --git a/bin/quantum-lbaas-agent b/bin/quantum-lbaas-agent
index 7c11322c0..878385c23 100755
--- a/bin/quantum-lbaas-agent
+++ b/bin/quantum-lbaas-agent
@@ -20,7 +20,7 @@ import os
 import sys
 sys.path.insert(0, os.getcwd())
 
-from quantum.plugins.services.agent_loadbalancer.drivers.haproxy.agent import main
+from quantum.services.loadbalancer.drivers.haproxy.agent import main
 
 
 main()
diff --git a/etc/lbaas_agent.ini b/etc/lbaas_agent.ini
index 2242cdc45..b0f7d8d2a 100644
--- a/etc/lbaas_agent.ini
+++ b/etc/lbaas_agent.ini
@@ -17,7 +17,7 @@ interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver
 
 # The agent requires a driver to manage the loadbalancer.  HAProxy is the
 # opensource version.
-device_driver = quantum.plugins.services.agent_loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver
+#device_driver = quantum.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver
 
 # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
 # iproute2 package that supports namespaces).
diff --git a/etc/quantum.conf b/etc/quantum.conf
index a79ee8538..911928210 100644
--- a/etc/quantum.conf
+++ b/etc/quantum.conf
@@ -322,4 +322,4 @@ signing_dir = /var/lib/quantum/keystone-signing
 # ==================================================================================================
 # driver_fqn is the fully qualified name of the lbaas driver that will be loaded by the lbass plugin
 # ==================================================================================================
-#driver_fqn = quantum.plugins.services.agent_loadbalancer.drivers.noop.noop_driver.NoopLbaaSDriver
+#driver_fqn = quantum.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver
diff --git a/quantum/services/loadbalancer/drivers/haproxy/agent_manager.py b/quantum/services/loadbalancer/drivers/haproxy/agent_manager.py
index f6f129226..626f85961 100644
--- a/quantum/services/loadbalancer/drivers/haproxy/agent_manager.py
+++ b/quantum/services/loadbalancer/drivers/haproxy/agent_manager.py
@@ -36,6 +36,8 @@ NS_PREFIX = 'qlbaas-'
 OPTS = [
     cfg.StrOpt(
         'device_driver',
+        default=('quantum.services.loadbalancer.drivers'
+                 '.haproxy.namespace_driver.HaproxyNSDriver'),
         help=_('The driver used to manage the loadbalancing device'),
     ),
     cfg.StrOpt(
diff --git a/setup.cfg b/setup.cfg
index bc7e4ab9a..2da05c891 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -75,7 +75,7 @@ console_scripts =
     quantum-dhcp-agent-dnsmasq-lease-update = quantum.agent.linux.dhcp:Dnsmasq.lease_update
     quantum-hyperv-agent = quantum.plugins.hyperv.agent.hyperv_quantum_agent:main
     quantum-l3-agent = quantum.agent.l3_agent:main
-    quantum-lbaas-agent = quantum.plugins.services.agent_loadbalancer.agent:main
+    quantum-lbaas-agent = quantum.services.loadbalancer.drivers.haproxy.agent:main
     quantum-linuxbridge-agent = quantum.plugins.linuxbridge.agent.linuxbridge_quantum_agent:main
     quantum-metadata-agent = quantum.agent.metadata.agent:main
     quantum-mlnx-agent = quantum.plugins.mlnx.agent.eswitch_quantum_agent:main