diff --git a/.pylintrc b/.pylintrc
index 0c90b4ad3a4..23a04a7d07f 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -56,7 +56,6 @@ disable=
  signature-differs,
  star-args,
  super-init-not-called,
- undefined-loop-variable,
  unnecessary-lambda,
  unnecessary-pass,
  unpacking-non-sequence,
diff --git a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
index 3617d7ecc35..706f0510404 100755
--- a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
+++ b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
@@ -523,15 +523,17 @@ class LinuxBridgeManager:
                          'command': 'bridge fdb',
                          'mode': 'VXLAN UCAST'})
             return False
-        for segmentation_id in moves.xrange(1, constants.MAX_VXLAN_VNI + 1):
+
+        test_iface = None
+        for seg_id in moves.xrange(1, constants.MAX_VXLAN_VNI + 1):
             if not ip_lib.device_exists(
-                    self.get_vxlan_device_name(segmentation_id)):
+                    self.get_vxlan_device_name(seg_id)):
+                test_iface = self.ensure_vxlan(seg_id)
                 break
         else:
             LOG.error(_LE('No valid Segmentation ID to perform UCAST test.'))
             return False
 
-        test_iface = self.ensure_vxlan(segmentation_id)
         try:
             utils.execute(
                 cmd=['bridge', 'fdb', 'append', constants.FLOODING_ENTRY[0],
diff --git a/neutron/services/loadbalancer/drivers/haproxy/cfg.py b/neutron/services/loadbalancer/drivers/haproxy/cfg.py
index 1200cf80e74..78e76eb908b 100644
--- a/neutron/services/loadbalancer/drivers/haproxy/cfg.py
+++ b/neutron/services/loadbalancer/drivers/haproxy/cfg.py
@@ -158,12 +158,13 @@ def _get_first_ip_from_port(port):
 
 def _get_server_health_option(config):
     """return the first active health option."""
-    for monitor in config['healthmonitors']:
+    for m in config['healthmonitors']:
         # not checking the status of healthmonitor for two reasons:
         # 1) status field is absent in HealthMonitor model
         # 2) only active HealthMonitors are fetched with
         # LoadBalancerCallbacks.get_logical_device
-        if monitor['admin_state_up']:
+        if m['admin_state_up']:
+            monitor = m
             break
     else:
         return '', []