summaryrefslogtreecommitdiff
path: root/ironic/dhcp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-05 04:00:29 +0000
committerGerrit Code Review <review@openstack.org>2015-02-05 04:00:29 +0000
commitb4f1db88683f5bb9ff0af7159e34c3117aa0beff (patch)
tree99aa54b8e0930fd404c1967032f24194afca8a4d /ironic/dhcp
parent5a5b72718bd7b690d75bd561fb496b25dbc7a535 (diff)
parent80aba0c9d403655a5b458c16d4d2141f4291afd7 (diff)
downloadironic-b4f1db88683f5bb9ff0af7159e34c3117aa0beff.tar.gz
Merge "Move oslo.config references to oslo_config"
Diffstat (limited to 'ironic/dhcp')
-rw-r--r--ironic/dhcp/neutron.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py
index e0b443c1e..ddcd57c59 100644
--- a/ironic/dhcp/neutron.py
+++ b/ironic/dhcp/neutron.py
@@ -18,8 +18,8 @@ import time
from neutronclient.common import exceptions as neutron_client_exc
from neutronclient.v2_0 import client as clientv20
-from oslo.config import cfg
from oslo.utils import netutils
+from oslo_config import cfg
from ironic.common import exception
from ironic.common.i18n import _