From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 13 Mar 2015 07:41:38 +0000 (+0000)
Subject: Merge "Use common agent.linux.utils.ensure_dir method"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=77fc12f3a7a4ccd283baa4eca824050a4df0494d;p=openstack-build%2Fneutron-build.git

Merge "Use common agent.linux.utils.ensure_dir method"
---

77fc12f3a7a4ccd283baa4eca824050a4df0494d
diff --cc neutron/agent/l3/ha.py
index 86b7169f3,99be4a101..cf693e396
--- a/neutron/agent/l3/ha.py
+++ b/neutron/agent/l3/ha.py
@@@ -16,11 -16,12 +16,12 @@@
  import os
  
  from oslo_config import cfg
 +from oslo_log import log as logging
  
  from neutron.agent.linux import keepalived
+ from neutron.agent.linux import utils
  from neutron.common import constants as l3_constants
  from neutron.i18n import _LE
 -from neutron.openstack.common import log as logging
  
  LOG = logging.getLogger(__name__)
  
diff --cc neutron/tests/unit/test_linux_dhcp.py
index 62de4ef92,b32f11bbd..e4f943b9b
--- a/neutron/tests/unit/test_linux_dhcp.py
+++ b/neutron/tests/unit/test_linux_dhcp.py
@@@ -24,8 -23,10 +24,9 @@@ from neutron.agent.common import confi
  from neutron.agent.dhcp import config as dhcp_config
  from neutron.agent.linux import dhcp
  from neutron.agent.linux import external_process
+ from neutron.agent.linux import utils
  from neutron.common import config as base_config
  from neutron.common import constants
 -from neutron.openstack.common import log as logging
  from neutron.tests import base
  
  LOG = logging.getLogger(__name__)