diff --git a/cloudbaseinit/metadata/services/base.py b/cloudbaseinit/metadata/services/base.py index 7a3dda54..abd52654 100644 --- a/cloudbaseinit/metadata/services/base.py +++ b/cloudbaseinit/metadata/services/base.py @@ -15,10 +15,11 @@ # under the License. import json -import logging import os import posixpath +from cloudbaseinit.openstack.common import log as logging + LOG = logging.getLogger(__name__) diff --git a/cloudbaseinit/metadata/services/configdrive/configdrive.py b/cloudbaseinit/metadata/services/configdrive/configdrive.py index 8abddde7..330817d7 100644 --- a/cloudbaseinit/metadata/services/configdrive/configdrive.py +++ b/cloudbaseinit/metadata/services/configdrive/configdrive.py @@ -15,7 +15,6 @@ # under the License. import json -import logging import os import shutil import tempfile @@ -23,6 +22,7 @@ import uuid from cloudbaseinit.metadata.services.base import * from cloudbaseinit.openstack.common import cfg +from cloudbaseinit.openstack.common import log as logging from manager import * opts = [ diff --git a/cloudbaseinit/metadata/services/configdrive/manager.py b/cloudbaseinit/metadata/services/configdrive/manager.py index af623ba6..1c4d8e2e 100644 --- a/cloudbaseinit/metadata/services/configdrive/manager.py +++ b/cloudbaseinit/metadata/services/configdrive/manager.py @@ -15,7 +15,6 @@ # under the License. import ctypes -import logging import os import shutil import sys @@ -25,6 +24,8 @@ import wmi from ctypes import wintypes +from cloudbaseinit.openstack.common import log as logging + from windows.disk.physical_disk import * from windows.disk.virtual_disk import * diff --git a/cloudbaseinit/metadata/services/httpservice.py b/cloudbaseinit/metadata/services/httpservice.py index ca650c78..7ab853fc 100644 --- a/cloudbaseinit/metadata/services/httpservice.py +++ b/cloudbaseinit/metadata/services/httpservice.py @@ -14,12 +14,12 @@ # License for the specific language governing permissions and limitations # under the License. -import logging import posixpath import urllib2 from cloudbaseinit.metadata.services.base import * from cloudbaseinit.openstack.common import cfg +from cloudbaseinit.openstack.common import log as logging opts = [ cfg.StrOpt('metadata_base_url', default='http://169.254.169.254/', diff --git a/cloudbaseinit/osutils/windows.py b/cloudbaseinit/osutils/windows.py index ccce5da0..1b241c74 100644 --- a/cloudbaseinit/osutils/windows.py +++ b/cloudbaseinit/osutils/windows.py @@ -16,12 +16,12 @@ import _winreg import ctypes -import logging import wmi from ctypes import windll from ctypes import wintypes +from cloudbaseinit.openstack.common import log as logging from cloudbaseinit.osutils.base import * advapi32 = windll.advapi32 diff --git a/cloudbaseinit/plugins/windows/createuser.py b/cloudbaseinit/plugins/windows/createuser.py index b4baf544..7bc4a3d4 100644 --- a/cloudbaseinit/plugins/windows/createuser.py +++ b/cloudbaseinit/plugins/windows/createuser.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -import logging import uuid from cloudbaseinit.openstack.common import cfg +from cloudbaseinit.openstack.common import log as logging from cloudbaseinit.osutils.factory import * from cloudbaseinit.plugins.base import * diff --git a/cloudbaseinit/plugins/windows/networkconfig.py b/cloudbaseinit/plugins/windows/networkconfig.py index 0db744d3..a7e2eb67 100644 --- a/cloudbaseinit/plugins/windows/networkconfig.py +++ b/cloudbaseinit/plugins/windows/networkconfig.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -import logging import re from cloudbaseinit.openstack.common import cfg +from cloudbaseinit.openstack.common import log as logging from cloudbaseinit.osutils.factory import * from cloudbaseinit.plugins.base import * diff --git a/cloudbaseinit/plugins/windows/sethostname.py b/cloudbaseinit/plugins/windows/sethostname.py index 45f00da4..aeaa0413 100644 --- a/cloudbaseinit/plugins/windows/sethostname.py +++ b/cloudbaseinit/plugins/windows/sethostname.py @@ -14,10 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from cloudbaseinit.osutils.factory import * from cloudbaseinit.plugins.base import * +from cloudbaseinit.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cloudbaseinit/plugins/windows/sshpublickeys.py b/cloudbaseinit/plugins/windows/sshpublickeys.py index 49b62ba2..e28b7939 100644 --- a/cloudbaseinit/plugins/windows/sshpublickeys.py +++ b/cloudbaseinit/plugins/windows/sshpublickeys.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -import logging import os from cloudbaseinit.openstack.common import cfg +from cloudbaseinit.openstack.common import log as logging from cloudbaseinit.osutils.factory import * from cloudbaseinit.plugins.base import * diff --git a/cloudbaseinit/plugins/windows/userdata.py b/cloudbaseinit/plugins/windows/userdata.py index 8786cfee..4b010102 100644 --- a/cloudbaseinit/plugins/windows/userdata.py +++ b/cloudbaseinit/plugins/windows/userdata.py @@ -14,11 +14,11 @@ # License for the specific language governing permissions and limitations # under the License. -import logging import re import tempfile import uuid +from cloudbaseinit.openstack.common import log as logging from cloudbaseinit.osutils.factory import * from cloudbaseinit.plugins.base import * diff --git a/cloudbaseinit/utils.py b/cloudbaseinit/utils.py index 2e252672..f8fcd2db 100644 --- a/cloudbaseinit/utils.py +++ b/cloudbaseinit/utils.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -import logging +from cloudbaseinit.openstack.common import log as logging LOG = logging.getLogger(__name__)