From: Arata Notsu <notsu@virtualtech.jp>
Date: Mon, 11 Nov 2013 11:33:43 +0000 (+0900)
Subject: Remove confusing comment and code for LBaaS
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=38474e2ae1062629cf3f478e2509f25831b8ade1;p=openstack-build%2Fneutron-build.git

Remove confusing comment and code for LBaaS

The comment "the driver is optional" is inconsistent with what actually
done. And "vif_driver = None" after raising an exception makes no sense.
So this patch removes these lines.

Change-Id: I7f3d5b6df61037307e952a478f47c59485601847
---

diff --git a/neutron/services/loadbalancer/drivers/haproxy/agent_manager.py b/neutron/services/loadbalancer/drivers/haproxy/agent_manager.py
index 6d9cb1be5..e5074cf92 100644
--- a/neutron/services/loadbalancer/drivers/haproxy/agent_manager.py
+++ b/neutron/services/loadbalancer/drivers/haproxy/agent_manager.py
@@ -124,10 +124,8 @@ class LbaasAgentManager(periodic_task.PeriodicTasks):
         try:
             vif_driver = importutils.import_object(conf.interface_driver, conf)
         except ImportError:
-            # the driver is optional
             msg = _('Error importing interface driver: %s')
             raise SystemExit(msg % conf.interface_driver)
-            vif_driver = None
 
         try:
             self.driver = importutils.import_object(