diff --git a/cloudpulse/TestManager/TestManager.py b/cloudpulse/TestManager/TestManager.py index 7f2a32b..dfd8468 100755 --- a/cloudpulse/TestManager/TestManager.py +++ b/cloudpulse/TestManager/TestManager.py @@ -19,8 +19,8 @@ from cloudpulse import objects from cloudpulse.openstack.common import service as os_service from cloudpulse.scenario import base import datetime -import logging from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import importutils import pytz import textwrap diff --git a/cloudpulse/conductor/cpulse_lock.py b/cloudpulse/conductor/cpulse_lock.py index 5711a56..4591286 100644 --- a/cloudpulse/conductor/cpulse_lock.py +++ b/cloudpulse/conductor/cpulse_lock.py @@ -14,7 +14,7 @@ from cloudpulse.common import exception from cloudpulse import objects import contextlib -import logging +from oslo_log import log as logging from oslo_utils import excutils import time diff --git a/cloudpulse/openstack/common/eventlet_backdoor.py b/cloudpulse/openstack/common/eventlet_backdoor.py index cd4f357..b89f844 100644 --- a/cloudpulse/openstack/common/eventlet_backdoor.py +++ b/cloudpulse/openstack/common/eventlet_backdoor.py @@ -19,7 +19,6 @@ from __future__ import print_function import copy import errno import gc -import logging import os import pprint import socket @@ -29,6 +28,7 @@ import traceback import eventlet.backdoor import greenlet from oslo_config import cfg +from oslo_log import log as logging from cloudpulse.openstack.common._i18n import _LI diff --git a/cloudpulse/openstack/common/loopingcall.py b/cloudpulse/openstack/common/loopingcall.py index a7978b7..5ff0065 100644 --- a/cloudpulse/openstack/common/loopingcall.py +++ b/cloudpulse/openstack/common/loopingcall.py @@ -15,12 +15,12 @@ # License for the specific language governing permissions and limitations # under the License. -import logging import sys import time from eventlet import event from eventlet import greenthread +from oslo_log import log as logging from cloudpulse.openstack.common._i18n import _LE, _LW diff --git a/cloudpulse/openstack/common/periodic_task.py b/cloudpulse/openstack/common/periodic_task.py index 4ea3c81..e9d0bed 100644 --- a/cloudpulse/openstack/common/periodic_task.py +++ b/cloudpulse/openstack/common/periodic_task.py @@ -12,11 +12,11 @@ # under the License. import copy -import logging import random import time from oslo_config import cfg +from oslo_log import log as logging from oslo_utils import reflection import six diff --git a/cloudpulse/openstack/common/service.py b/cloudpulse/openstack/common/service.py index ae741f0..82be17a 100644 --- a/cloudpulse/openstack/common/service.py +++ b/cloudpulse/openstack/common/service.py @@ -19,7 +19,6 @@ import errno import io -import logging import os import random import signal @@ -29,6 +28,7 @@ import time import eventlet from eventlet import event from oslo_config import cfg +from oslo_log import log as logging from cloudpulse.openstack.common import eventlet_backdoor from cloudpulse.openstack.common._i18n import _LE, _LI, _LW diff --git a/cloudpulse/openstack/common/systemd.py b/cloudpulse/openstack/common/systemd.py index 36243b3..8f90b2f 100644 --- a/cloudpulse/openstack/common/systemd.py +++ b/cloudpulse/openstack/common/systemd.py @@ -16,11 +16,11 @@ Helper module for systemd service readiness notification. """ -import logging import os import socket import sys +from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/cloudpulse/openstack/common/threadgroup.py b/cloudpulse/openstack/common/threadgroup.py index b7cbee4..a438a65 100644 --- a/cloudpulse/openstack/common/threadgroup.py +++ b/cloudpulse/openstack/common/threadgroup.py @@ -11,12 +11,13 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import logging import threading import eventlet from eventlet import greenpool +from oslo_log import log as logging + from cloudpulse.openstack.common._i18n import _LE from cloudpulse.openstack.common import loopingcall diff --git a/cloudpulse/openstack/common/versionutils.py b/cloudpulse/openstack/common/versionutils.py index 067dce4..4bbf587 100644 --- a/cloudpulse/openstack/common/versionutils.py +++ b/cloudpulse/openstack/common/versionutils.py @@ -20,9 +20,9 @@ Helpers for comparing version strings. import copy import functools import inspect -import logging from oslo_config import cfg +from oslo_log import log as logging import pkg_resources import six