diff options
| author | ZhiQiang Fan <zhiqiang.fan@huawei.com> | 2015-01-16 18:35:10 +0800 |
|---|---|---|
| committer | gordon chung <gord@live.ca> | 2015-05-28 11:08:02 -0400 |
| commit | c612727ff8a166e27154e5b3d62a2943f227446a (patch) | |
| tree | 7151bbb00e4b74b567e62be3e66a881ce205022d /ceilometer/ipmi | |
| parent | 348c2263b646229f5665ab24bea988359103722e (diff) | |
| download | ceilometer-c612727ff8a166e27154e5b3d62a2943f227446a.tar.gz | |
use oslo.log instead of oslo-incubator code
oslo.log has graduated from oslo-incubator, and openstack.common.log
has been removed from oslo-incubator, so let's use the new one.
NOTE1:openstack.common.log registers its options at import time, but
oslo.log needs to call register_options() explicitly.
NOTE2: split unit test case in tests/objectstore/test_swift_middleware.py
to avoid duplicate cli option register exception, see NOTE1.
Change-Id: Ida30808dbe0c584919755c207ca4ee4b91963a17
Diffstat (limited to 'ceilometer/ipmi')
| -rw-r--r-- | ceilometer/ipmi/notifications/ironic.py | 2 | ||||
| -rw-r--r-- | ceilometer/ipmi/pollsters/node.py | 2 | ||||
| -rw-r--r-- | ceilometer/ipmi/pollsters/sensor.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ceilometer/ipmi/notifications/ironic.py b/ceilometer/ipmi/notifications/ironic.py index a341761c..a4456d89 100644 --- a/ceilometer/ipmi/notifications/ironic.py +++ b/ceilometer/ipmi/notifications/ironic.py @@ -17,10 +17,10 @@ notification events. """ from oslo_config import cfg +from oslo_log import log import oslo_messaging as messaging from ceilometer.agent import plugin_base -from ceilometer.openstack.common import log from ceilometer import sample LOG = log.getLogger(__name__) diff --git a/ceilometer/ipmi/pollsters/node.py b/ceilometer/ipmi/pollsters/node.py index 63b97371..d786171c 100644 --- a/ceilometer/ipmi/pollsters/node.py +++ b/ceilometer/ipmi/pollsters/node.py @@ -15,6 +15,7 @@ import abc from oslo_config import cfg +from oslo_log import log from oslo_utils import timeutils import six @@ -22,7 +23,6 @@ from ceilometer.agent import plugin_base from ceilometer.i18n import _ from ceilometer.ipmi.platform import exception as nmexcept from ceilometer.ipmi.platform import intel_node_manager as node_manager -from ceilometer.openstack.common import log from ceilometer import sample CONF = cfg.CONF diff --git a/ceilometer/ipmi/pollsters/sensor.py b/ceilometer/ipmi/pollsters/sensor.py index dbfd95c7..72ca739b 100644 --- a/ceilometer/ipmi/pollsters/sensor.py +++ b/ceilometer/ipmi/pollsters/sensor.py @@ -13,6 +13,7 @@ # under the License. from oslo_config import cfg +from oslo_log import log from oslo_utils import timeutils from ceilometer.agent import plugin_base @@ -20,7 +21,6 @@ from ceilometer.i18n import _ from ceilometer.ipmi.notifications import ironic as parser from ceilometer.ipmi.platform import exception as ipmiexcept from ceilometer.ipmi.platform import ipmi_sensor -from ceilometer.openstack.common import log from ceilometer import sample CONF = cfg.CONF |