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

diff --cc neutron/agent/dhcp/agent.py
Simple merge

diff --cc neutron/agent/l3/ha.py
index 86b7169f328db50b0a5eaab643e92c6e204829be,99be4a101b78d9e35a1631749dd4f8439999e15f..cf693e39694bc42cd3b544d80cd377329de6d6b7
--- 1/neutron/agent/l3/ha.py
--- 2/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/agent/linux/dhcp.py
Simple merge

diff --cc neutron/agent/linux/keepalived.py
Simple merge

diff --cc neutron/agent/metadata/agent.py
Simple merge

diff --cc neutron/tests/unit/test_l3_agent.py
Simple merge

diff --cc neutron/tests/unit/test_linux_dhcp.py
index 62de4ef92695446a3e7229083d43af3b09a86749,b32f11bbd2d54a2cd0a60aa64024a92c4269cc4d..e4f943b9b6fcd1c8f6be0ba32db1292068990b0a
--- 1/neutron/tests/unit/test_linux_dhcp.py
--- 2/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__)