From d7dff62e0aa3bd6496f2b392753cc7d96f203023 Mon Sep 17 00:00:00 2001
From: Alessandro Pilotti <apilotti@cloudbasesolutions.com>
Date: Mon, 10 Feb 2014 04:47:28 +0200
Subject: [PATCH] Move to oslo.config

---
 cloudbaseinit/init.py                                    | 3 ++-
 cloudbaseinit/metadata/factory.py                        | 3 ++-
 cloudbaseinit/metadata/services/base.py                  | 3 ++-
 .../metadata/services/configdrive/configdrive.py         | 3 ++-
 cloudbaseinit/metadata/services/ec2service.py            | 3 ++-
 cloudbaseinit/metadata/services/httpservice.py           | 3 ++-
 cloudbaseinit/plugins/factory.py                         | 3 ++-
 cloudbaseinit/plugins/windows/createuser.py              | 3 ++-
 cloudbaseinit/plugins/windows/extendvolumes.py           | 3 ++-
 cloudbaseinit/plugins/windows/networkconfig.py           | 3 ++-
 cloudbaseinit/plugins/windows/sethostname.py             | 3 ++-
 cloudbaseinit/plugins/windows/setuserpassword.py         | 3 ++-
 cloudbaseinit/plugins/windows/sshpublickeys.py           | 3 ++-
 cloudbaseinit/plugins/windows/userdataplugins/factory.py | 3 ++-
 cloudbaseinit/plugins/windows/userdataplugins/heat.py    | 3 ++-
 cloudbaseinit/plugins/windows/winrmlistener.py           | 3 ++-
 cloudbaseinit/shell.py                                   | 3 ++-
 .../metadata/services/configdrive/test_configdrive.py    | 2 +-
 cloudbaseinit/tests/metadata/services/test_ec2service.py | 3 ++-
 .../tests/metadata/services/test_httpservice.py          | 3 ++-
 cloudbaseinit/tests/osutils/test_windows.py              | 3 ++-
 cloudbaseinit/tests/plugins/test_factory.py              | 3 ++-
 cloudbaseinit/tests/plugins/windows/test_createuser.py   | 3 ++-
 .../tests/plugins/windows/test_extendvolumes.py          | 2 +-
 .../tests/plugins/windows/test_networkconfig.py          | 3 ++-
 cloudbaseinit/tests/plugins/windows/test_sethostname.py  | 3 ++-
 .../tests/plugins/windows/test_setuserpassword.py        | 3 ++-
 .../tests/plugins/windows/test_sshpublickeys.py          | 3 ++-
 cloudbaseinit/tests/plugins/windows/test_userdata.py     | 3 ++-
 .../tests/plugins/windows/test_userdatautils.py          | 3 ++-
 .../tests/plugins/windows/test_winrmcertificateauth.py   | 3 ++-
 cloudbaseinit/tests/plugins/windows/test_winrmconfig.py  | 3 ++-
 .../tests/plugins/windows/test_winrmlistener.py          | 2 +-
 cloudbaseinit/tests/plugins/windows/test_x509.py         | 3 ++-
 .../windows/userdataplugins/test_cloudboothook.py        | 3 ++-
 .../plugins/windows/userdataplugins/test_cloudconfig.py  | 3 ++-
 .../plugins/windows/userdataplugins/test_factory.py      | 3 ++-
 .../tests/plugins/windows/userdataplugins/test_heat.py   | 3 ++-
 .../plugins/windows/userdataplugins/test_parthandler.py  | 3 ++-
 .../plugins/windows/userdataplugins/test_shellscript.py  | 3 ++-
 cloudbaseinit/tests/test_init.py                         | 3 ++-
 cloudbaseinit/utils/log.py                               | 9 ++-------
 tools/pip-requires                                       | 1 +
 43 files changed, 82 insertions(+), 48 deletions(-)

diff --git a/cloudbaseinit/init.py b/cloudbaseinit/init.py
index 32e62c43..420a8141 100644
--- a/cloudbaseinit/init.py
+++ b/cloudbaseinit/init.py
@@ -16,8 +16,9 @@
 
 import sys
 
+from oslo.config import cfg
+
 from cloudbaseinit.metadata import factory as metadata_factory
-from cloudbaseinit.openstack.common import cfg
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.osutils import factory as osutils_factory
 from cloudbaseinit.plugins import base as plugins_base
diff --git a/cloudbaseinit/metadata/factory.py b/cloudbaseinit/metadata/factory.py
index b44a21a3..04f5c694 100644
--- a/cloudbaseinit/metadata/factory.py
+++ b/cloudbaseinit/metadata/factory.py
@@ -14,7 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.utils import classloader
 
diff --git a/cloudbaseinit/metadata/services/base.py b/cloudbaseinit/metadata/services/base.py
index f0f8bba9..5c4385a0 100644
--- a/cloudbaseinit/metadata/services/base.py
+++ b/cloudbaseinit/metadata/services/base.py
@@ -19,7 +19,8 @@ import json
 import posixpath
 import time
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.openstack.common import log as logging
 
 opts = [
diff --git a/cloudbaseinit/metadata/services/configdrive/configdrive.py b/cloudbaseinit/metadata/services/configdrive/configdrive.py
index c2d67d6c..e7d4b68b 100644
--- a/cloudbaseinit/metadata/services/configdrive/configdrive.py
+++ b/cloudbaseinit/metadata/services/configdrive/configdrive.py
@@ -19,8 +19,9 @@ import shutil
 import tempfile
 import uuid
 
+from oslo.config import cfg
+
 from cloudbaseinit.metadata.services import base
-from cloudbaseinit.openstack.common import cfg
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.metadata.services.configdrive import manager
 
diff --git a/cloudbaseinit/metadata/services/ec2service.py b/cloudbaseinit/metadata/services/ec2service.py
index 1a9778b3..b3b7b272 100644
--- a/cloudbaseinit/metadata/services/ec2service.py
+++ b/cloudbaseinit/metadata/services/ec2service.py
@@ -19,8 +19,9 @@ import urllib2
 import traceback
 import os
 
+from oslo.config import cfg
+
 from cloudbaseinit.metadata.services import base
-from cloudbaseinit.openstack.common import cfg
 from cloudbaseinit.openstack.common import log as logging
 
 opts = [
diff --git a/cloudbaseinit/metadata/services/httpservice.py b/cloudbaseinit/metadata/services/httpservice.py
index d56e90a8..731a8382 100644
--- a/cloudbaseinit/metadata/services/httpservice.py
+++ b/cloudbaseinit/metadata/services/httpservice.py
@@ -18,8 +18,9 @@ import posixpath
 import urllib2
 import urlparse
 
+from oslo.config import cfg
+
 from cloudbaseinit.metadata.services import base
-from cloudbaseinit.openstack.common import cfg
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.osutils import factory as osutils_factory
 
diff --git a/cloudbaseinit/plugins/factory.py b/cloudbaseinit/plugins/factory.py
index 8b60442f..aeb3f11d 100644
--- a/cloudbaseinit/plugins/factory.py
+++ b/cloudbaseinit/plugins/factory.py
@@ -14,7 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.utils import classloader
 
 opts = [
diff --git a/cloudbaseinit/plugins/windows/createuser.py b/cloudbaseinit/plugins/windows/createuser.py
index e03cba29..9262cbf1 100644
--- a/cloudbaseinit/plugins/windows/createuser.py
+++ b/cloudbaseinit/plugins/windows/createuser.py
@@ -14,7 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.osutils import factory as osutils_factory
 from cloudbaseinit.plugins import base
diff --git a/cloudbaseinit/plugins/windows/extendvolumes.py b/cloudbaseinit/plugins/windows/extendvolumes.py
index f82de176..67908291 100644
--- a/cloudbaseinit/plugins/windows/extendvolumes.py
+++ b/cloudbaseinit/plugins/windows/extendvolumes.py
@@ -17,7 +17,8 @@
 import ctypes
 import re
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.plugins import base
 from cloudbaseinit.plugins.windows import vds
diff --git a/cloudbaseinit/plugins/windows/networkconfig.py b/cloudbaseinit/plugins/windows/networkconfig.py
index b67edb8d..cacc1840 100644
--- a/cloudbaseinit/plugins/windows/networkconfig.py
+++ b/cloudbaseinit/plugins/windows/networkconfig.py
@@ -16,7 +16,8 @@
 
 import re
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.osutils import factory as osutils_factory
 from cloudbaseinit.plugins import base
diff --git a/cloudbaseinit/plugins/windows/sethostname.py b/cloudbaseinit/plugins/windows/sethostname.py
index d13f8c43..03af02dc 100644
--- a/cloudbaseinit/plugins/windows/sethostname.py
+++ b/cloudbaseinit/plugins/windows/sethostname.py
@@ -14,7 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.osutils import factory as osutils_factory
 from cloudbaseinit.plugins import base
diff --git a/cloudbaseinit/plugins/windows/setuserpassword.py b/cloudbaseinit/plugins/windows/setuserpassword.py
index 9ea34d7d..c3a05ee9 100644
--- a/cloudbaseinit/plugins/windows/setuserpassword.py
+++ b/cloudbaseinit/plugins/windows/setuserpassword.py
@@ -16,8 +16,9 @@
 
 import base64
 
+from oslo.config import cfg
+
 from cloudbaseinit.metadata.services import base as services_base
-from cloudbaseinit.openstack.common import cfg
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.osutils import factory as osutils_factory
 from cloudbaseinit.plugins import base
diff --git a/cloudbaseinit/plugins/windows/sshpublickeys.py b/cloudbaseinit/plugins/windows/sshpublickeys.py
index 1a17307d..e34be2a6 100644
--- a/cloudbaseinit/plugins/windows/sshpublickeys.py
+++ b/cloudbaseinit/plugins/windows/sshpublickeys.py
@@ -16,7 +16,8 @@
 
 import os
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.osutils import factory as osutils_factory
 from cloudbaseinit.plugins import base
diff --git a/cloudbaseinit/plugins/windows/userdataplugins/factory.py b/cloudbaseinit/plugins/windows/userdataplugins/factory.py
index 4c58d154..1ea1300f 100644
--- a/cloudbaseinit/plugins/windows/userdataplugins/factory.py
+++ b/cloudbaseinit/plugins/windows/userdataplugins/factory.py
@@ -12,7 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.utils import classloader
 
 opts = [
diff --git a/cloudbaseinit/plugins/windows/userdataplugins/heat.py b/cloudbaseinit/plugins/windows/userdataplugins/heat.py
index 394ff7d1..0d560424 100644
--- a/cloudbaseinit/plugins/windows/userdataplugins/heat.py
+++ b/cloudbaseinit/plugins/windows/userdataplugins/heat.py
@@ -15,7 +15,8 @@
 
 import os
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.plugins.windows.userdataplugins import base
 from cloudbaseinit.plugins.windows import userdatautils
diff --git a/cloudbaseinit/plugins/windows/winrmlistener.py b/cloudbaseinit/plugins/windows/winrmlistener.py
index 56eaa78a..328d5187 100644
--- a/cloudbaseinit/plugins/windows/winrmlistener.py
+++ b/cloudbaseinit/plugins/windows/winrmlistener.py
@@ -14,7 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.osutils import factory as osutils_factory
 from cloudbaseinit.plugins import base
diff --git a/cloudbaseinit/shell.py b/cloudbaseinit/shell.py
index 88414333..f36c6f9c 100644
--- a/cloudbaseinit/shell.py
+++ b/cloudbaseinit/shell.py
@@ -16,8 +16,9 @@
 
 import sys
 
+from oslo.config import cfg
+
 from cloudbaseinit import init
-from cloudbaseinit.openstack.common import cfg
 from cloudbaseinit.utils import log as logging
 
 CONF = cfg.CONF
diff --git a/cloudbaseinit/tests/metadata/services/configdrive/test_configdrive.py b/cloudbaseinit/tests/metadata/services/configdrive/test_configdrive.py
index dd28414b..3a872aea 100644
--- a/cloudbaseinit/tests/metadata/services/configdrive/test_configdrive.py
+++ b/cloudbaseinit/tests/metadata/services/configdrive/test_configdrive.py
@@ -21,7 +21,7 @@ import sys
 import unittest
 import uuid
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
 
 CONF = cfg.CONF
 _win32com_mock = mock.MagicMock()
diff --git a/cloudbaseinit/tests/metadata/services/test_ec2service.py b/cloudbaseinit/tests/metadata/services/test_ec2service.py
index 2fa4f004..8fd2a726 100644
--- a/cloudbaseinit/tests/metadata/services/test_ec2service.py
+++ b/cloudbaseinit/tests/metadata/services/test_ec2service.py
@@ -18,8 +18,9 @@ import mock
 import os
 import unittest
 
+from oslo.config import cfg
+
 from cloudbaseinit.metadata.services import ec2service
-from cloudbaseinit.openstack.common import cfg
 
 CONF = cfg.CONF
 
diff --git a/cloudbaseinit/tests/metadata/services/test_httpservice.py b/cloudbaseinit/tests/metadata/services/test_httpservice.py
index 97899836..c2e9dcd1 100644
--- a/cloudbaseinit/tests/metadata/services/test_httpservice.py
+++ b/cloudbaseinit/tests/metadata/services/test_httpservice.py
@@ -19,9 +19,10 @@ import os
 import unittest
 import urllib2
 
+from oslo.config import cfg
+
 from cloudbaseinit.metadata.services import base
 from cloudbaseinit.metadata.services import httpservice
-from cloudbaseinit.openstack.common import cfg
 
 CONF = cfg.CONF
 
diff --git a/cloudbaseinit/tests/osutils/test_windows.py b/cloudbaseinit/tests/osutils/test_windows.py
index 53b8652b..1784ba26 100644
--- a/cloudbaseinit/tests/osutils/test_windows.py
+++ b/cloudbaseinit/tests/osutils/test_windows.py
@@ -20,6 +20,8 @@ import time
 import sys
 import unittest
 
+from oslo.config import cfg
+
 if sys.platform == 'win32':
     import _winreg
     import win32process
@@ -29,7 +31,6 @@ if sys.platform == 'win32':
     from ctypes import windll
     from ctypes import wintypes
     from cloudbaseinit.osutils import windows as windows_utils
-from cloudbaseinit.openstack.common import cfg
 
 CONF = cfg.CONF
 
diff --git a/cloudbaseinit/tests/plugins/test_factory.py b/cloudbaseinit/tests/plugins/test_factory.py
index f45b3bc0..feae96ea 100644
--- a/cloudbaseinit/tests/plugins/test_factory.py
+++ b/cloudbaseinit/tests/plugins/test_factory.py
@@ -17,8 +17,9 @@
 import mock
 import unittest
 
+from oslo.config import cfg
+
 from cloudbaseinit.plugins import factory
-from cloudbaseinit.openstack.common import cfg
 
 CONF = cfg.CONF
 
diff --git a/cloudbaseinit/tests/plugins/windows/test_createuser.py b/cloudbaseinit/tests/plugins/windows/test_createuser.py
index 8ff6699f..382e2685 100644
--- a/cloudbaseinit/tests/plugins/windows/test_createuser.py
+++ b/cloudbaseinit/tests/plugins/windows/test_createuser.py
@@ -17,7 +17,8 @@
 import mock
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.plugins import base
 from cloudbaseinit.plugins.windows import createuser
 
diff --git a/cloudbaseinit/tests/plugins/windows/test_extendvolumes.py b/cloudbaseinit/tests/plugins/windows/test_extendvolumes.py
index 16334bef..d4bdfabc 100644
--- a/cloudbaseinit/tests/plugins/windows/test_extendvolumes.py
+++ b/cloudbaseinit/tests/plugins/windows/test_extendvolumes.py
@@ -20,7 +20,7 @@ import re
 import sys
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
 
 CONF = cfg.CONF
 
diff --git a/cloudbaseinit/tests/plugins/windows/test_networkconfig.py b/cloudbaseinit/tests/plugins/windows/test_networkconfig.py
index 210028f5..85c31626 100644
--- a/cloudbaseinit/tests/plugins/windows/test_networkconfig.py
+++ b/cloudbaseinit/tests/plugins/windows/test_networkconfig.py
@@ -18,7 +18,8 @@ import mock
 import re
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.plugins.windows import networkconfig
 from cloudbaseinit.tests.metadata import fake_json_response
 
diff --git a/cloudbaseinit/tests/plugins/windows/test_sethostname.py b/cloudbaseinit/tests/plugins/windows/test_sethostname.py
index 655c036a..d240b7db 100644
--- a/cloudbaseinit/tests/plugins/windows/test_sethostname.py
+++ b/cloudbaseinit/tests/plugins/windows/test_sethostname.py
@@ -19,7 +19,8 @@ import random
 import string
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.plugins.windows import sethostname
 from cloudbaseinit.tests.metadata import fake_json_response
 
diff --git a/cloudbaseinit/tests/plugins/windows/test_setuserpassword.py b/cloudbaseinit/tests/plugins/windows/test_setuserpassword.py
index acf080b4..2f744a02 100644
--- a/cloudbaseinit/tests/plugins/windows/test_setuserpassword.py
+++ b/cloudbaseinit/tests/plugins/windows/test_setuserpassword.py
@@ -17,7 +17,8 @@
 import mock
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.plugins import constants
 from cloudbaseinit.plugins.windows import setuserpassword
 from cloudbaseinit.tests.metadata import fake_json_response
diff --git a/cloudbaseinit/tests/plugins/windows/test_sshpublickeys.py b/cloudbaseinit/tests/plugins/windows/test_sshpublickeys.py
index 88451e94..626a53d2 100644
--- a/cloudbaseinit/tests/plugins/windows/test_sshpublickeys.py
+++ b/cloudbaseinit/tests/plugins/windows/test_sshpublickeys.py
@@ -18,8 +18,9 @@ import mock
 import os
 import unittest
 
+from oslo.config import cfg
+
 from cloudbaseinit.plugins.windows import sshpublickeys
-from cloudbaseinit.openstack.common import cfg
 from cloudbaseinit.tests.metadata import fake_json_response
 
 CONF = cfg.CONF
diff --git a/cloudbaseinit/tests/plugins/windows/test_userdata.py b/cloudbaseinit/tests/plugins/windows/test_userdata.py
index f6de2612..3d287536 100644
--- a/cloudbaseinit/tests/plugins/windows/test_userdata.py
+++ b/cloudbaseinit/tests/plugins/windows/test_userdata.py
@@ -17,8 +17,9 @@
 import mock
 import unittest
 
+from oslo.config import cfg
+
 from cloudbaseinit.metadata.services import base as metadata_services_base
-from cloudbaseinit.openstack.common import cfg
 from cloudbaseinit.plugins import base
 from cloudbaseinit.plugins.windows import userdata
 from cloudbaseinit.tests.metadata import fake_json_response
diff --git a/cloudbaseinit/tests/plugins/windows/test_userdatautils.py b/cloudbaseinit/tests/plugins/windows/test_userdatautils.py
index acf3b8f0..5ee05473 100644
--- a/cloudbaseinit/tests/plugins/windows/test_userdatautils.py
+++ b/cloudbaseinit/tests/plugins/windows/test_userdatautils.py
@@ -17,7 +17,8 @@ import os
 import uuid
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.plugins.windows import userdatautils
 from cloudbaseinit.tests.metadata import fake_json_response
 
diff --git a/cloudbaseinit/tests/plugins/windows/test_winrmcertificateauth.py b/cloudbaseinit/tests/plugins/windows/test_winrmcertificateauth.py
index 72889d27..6a09b531 100644
--- a/cloudbaseinit/tests/plugins/windows/test_winrmcertificateauth.py
+++ b/cloudbaseinit/tests/plugins/windows/test_winrmcertificateauth.py
@@ -28,7 +28,8 @@ mock_dict = {'ctypes': _ctypes_mock,
              'pywintypes': _pywintypes_mock}
 
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.plugins import constants
 
 CONF = cfg.CONF
diff --git a/cloudbaseinit/tests/plugins/windows/test_winrmconfig.py b/cloudbaseinit/tests/plugins/windows/test_winrmconfig.py
index b6945659..d0b581de 100644
--- a/cloudbaseinit/tests/plugins/windows/test_winrmconfig.py
+++ b/cloudbaseinit/tests/plugins/windows/test_winrmconfig.py
@@ -18,7 +18,8 @@ import mock
 import sys
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 if sys.platform == 'win32':
     from cloudbaseinit.plugins.windows import winrmconfig
 
diff --git a/cloudbaseinit/tests/plugins/windows/test_winrmlistener.py b/cloudbaseinit/tests/plugins/windows/test_winrmlistener.py
index a2252139..f2e83068 100644
--- a/cloudbaseinit/tests/plugins/windows/test_winrmlistener.py
+++ b/cloudbaseinit/tests/plugins/windows/test_winrmlistener.py
@@ -19,7 +19,7 @@ import mock
 import sys
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
 
 CONF = cfg.CONF
 _mock_wintypes = mock.MagicMock()
diff --git a/cloudbaseinit/tests/plugins/windows/test_x509.py b/cloudbaseinit/tests/plugins/windows/test_x509.py
index de942160..f296ec95 100644
--- a/cloudbaseinit/tests/plugins/windows/test_x509.py
+++ b/cloudbaseinit/tests/plugins/windows/test_x509.py
@@ -18,7 +18,8 @@ import mock
 import sys
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 if sys.platform == 'win32':
     from cloudbaseinit.plugins.windows import cryptoapi
     from cloudbaseinit.plugins.windows import x509
diff --git a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_cloudboothook.py b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_cloudboothook.py
index 30d4da1f..05e93395 100644
--- a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_cloudboothook.py
+++ b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_cloudboothook.py
@@ -17,7 +17,8 @@
 import mock
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.plugins.windows.userdataplugins import cloudboothook
 
 CONF = cfg.CONF
diff --git a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_cloudconfig.py b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_cloudconfig.py
index 732ce156..33e8afcc 100644
--- a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_cloudconfig.py
+++ b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_cloudconfig.py
@@ -17,7 +17,8 @@
 import mock
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.plugins.windows.userdataplugins import cloudconfig
 
 CONF = cfg.CONF
diff --git a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_factory.py b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_factory.py
index 7f8431d3..cc8a8546 100644
--- a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_factory.py
+++ b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_factory.py
@@ -17,7 +17,8 @@
 import mock
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.plugins.windows.userdataplugins import factory
 
 CONF = cfg.CONF
diff --git a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_heat.py b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_heat.py
index 1015a185..58cbc571 100644
--- a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_heat.py
+++ b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_heat.py
@@ -17,7 +17,8 @@
 import mock
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.plugins.windows.userdataplugins import heat
 
 CONF = cfg.CONF
diff --git a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_parthandler.py b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_parthandler.py
index 9e485b53..80fca297 100644
--- a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_parthandler.py
+++ b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_parthandler.py
@@ -18,7 +18,8 @@ import mock
 import os
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.plugins.windows.userdataplugins import parthandler
 
 CONF = cfg.CONF
diff --git a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_shellscript.py b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_shellscript.py
index a6bb2dd3..66ad6cf3 100644
--- a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_shellscript.py
+++ b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_shellscript.py
@@ -18,7 +18,8 @@ import mock
 import os
 import unittest
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.plugins.windows.userdataplugins import shellscript
 
 CONF = cfg.CONF
diff --git a/cloudbaseinit/tests/test_init.py b/cloudbaseinit/tests/test_init.py
index 21cf0a5f..98b35bf0 100644
--- a/cloudbaseinit/tests/test_init.py
+++ b/cloudbaseinit/tests/test_init.py
@@ -18,9 +18,10 @@ import mock
 import unittest
 import sys
 
+from oslo.config import cfg
+
 from cloudbaseinit import init
 from cloudbaseinit.plugins import base
-from cloudbaseinit.openstack.common import cfg
 
 CONF = cfg.CONF
 _win32com_mock = mock.MagicMock()
diff --git a/cloudbaseinit/utils/log.py b/cloudbaseinit/utils/log.py
index acfa8888..2f215277 100644
--- a/cloudbaseinit/utils/log.py
+++ b/cloudbaseinit/utils/log.py
@@ -15,7 +15,8 @@
 import logging
 import serial
 
-from cloudbaseinit.openstack.common import cfg
+from oslo.config import cfg
+
 from cloudbaseinit.openstack.common import log as openstack_logging
 
 opts = [
@@ -27,7 +28,6 @@ opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(opts)
-CONF.import_opt('default_log_levels', 'cloudbaseinit.openstack.common.log')
 CONF.import_opt('log_date_format', 'cloudbaseinit.openstack.common.log')
 CONF.import_opt('log_format', 'cloudbaseinit.openstack.common.log')
 
@@ -66,8 +66,3 @@ def setup(product_name):
                                                          datefmt=datefmt))
         serialportlog.setFormatter(
             openstack_logging.LegacyFormatter(datefmt=datefmt))
-
-        for pair in CONF.default_log_levels:
-            mod, _sep, level_name = pair.partition('=')
-            logger = logging.getLogger(mod)
-            logger.addHandler(serialportlog)
diff --git a/tools/pip-requires b/tools/pip-requires
index 0cce4b00..2322ead3 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -3,3 +3,4 @@ wmi
 iso8601
 eventlet
 pyserial
+oslo.config