From 13374076173a92fcc306bf38bf186c53efa2ca38 Mon Sep 17 00:00:00 2001 From: Arata Notsu Date: Mon, 11 Nov 2013 20:33:43 +0900 Subject: [PATCH] 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 --- neutron/services/loadbalancer/drivers/haproxy/agent_manager.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/neutron/services/loadbalancer/drivers/haproxy/agent_manager.py b/neutron/services/loadbalancer/drivers/haproxy/agent_manager.py index 6d9cb1be5d..e5074cf92b 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(