Move to oslo.config

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

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
 

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 = [

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
 

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 = [

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
 

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 = [

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

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

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

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

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

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

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 = [

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

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

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

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()

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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

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

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
 

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

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
 

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()

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

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

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

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

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

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

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

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()

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)

tools/pip-requires

@@ -3,3 +3,4 @@ wmi
 iso8601
 eventlet
 pyserial
+oslo.config