x/vmware-nsx
Code Issues Proposed changes

Merge "Remove confusing comment and code for LBaaS"

Browse Source
This commit is contained in:
Jenkins 2013-11-11 16:54:47 +00:00 committed by Gerrit Code Review
commit 731f291a7f
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/services/loadbalancer/drivers/haproxy/agent_manager.py
View File

@ -124,10 +124,8 @@ class LbaasAgentManager(periodic_task.PeriodicTasks):
try: try:
vif_driver = importutils.import_object(conf.interface_driver, conf) vif_driver = importutils.import_object(conf.interface_driver, conf)
except ImportError: except ImportError:
# the driver is optional
msg = _('Error importing interface driver: %s') msg = _('Error importing interface driver: %s')
raise SystemExit(msg % conf.interface_driver) raise SystemExit(msg % conf.interface_driver)
vif_driver = None
try: try:
self.driver = importutils.import_object( self.driver = importutils.import_object(