From: Jakub Libosvar <libosvar@redhat.com>
Date: Wed, 30 Jul 2014 08:42:14 +0000 (+0200)
Subject: Use correct section for log message if interface_driver import fails
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=25c5291addcd3ed0ef9df567a828866f1681e014;p=openstack-build%2Fneutron-build.git

Use correct section for log message if interface_driver import fails

If import of interface_driver in namespace_driver fails then message for
logger raises exception because of taking interface_driver from haproxy
section while actual interface_driver is in default section.

Closes-Bug: #1350320
Change-Id: Ic1e73c0cdccb2fff02f2adfbad677503c29ba88a
---

diff --git a/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py b/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py
index 967c65e7f..fc6d1011d 100644
--- a/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py
+++ b/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py
@@ -73,7 +73,7 @@ class HaproxyNSDriver(agent_device_driver.AgentDeviceDriver):
         except ImportError:
             with excutils.save_and_reraise_exception():
                 msg = (_('Error importing interface driver: %s')
-                       % conf.haproxy.interface_driver)
+                       % conf.interface_driver)
                 LOG.error(msg)
 
         self.vif_driver = vif_driver