From 9016692140f37bcf2eb87bfc72ac4415e0e5b8a2 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 12 Feb 2013 11:22:26 +0100 Subject: [PATCH] Import service when cfg.CONF.os_* is used This doesn't look like it fixes something, but it actually does when you try to run some unit test independently without loading the whole suite, some of them fails because these cfg.CONF variables are not accessible. Change-Id: Iaac74ec5d414de4e4b1d0c7d200ad6d4d3208a42 Signed-off-by: Julien Danjou --- ceilometer/central/manager.py | 1 + ceilometer/nova_client.py | 1 + 2 files changed, 2 insertions(+) diff --git a/ceilometer/central/manager.py b/ceilometer/central/manager.py index eb97b6894..fb836c902 100644 --- a/ceilometer/central/manager.py +++ b/ceilometer/central/manager.py @@ -21,6 +21,7 @@ from keystoneclient.v2_0 import client as ksclient from ceilometer import agent from ceilometer import extension_manager from ceilometer.openstack.common import cfg +from ceilometer import service # For cfg.CONF.os_* OPTS = [ cfg.ListOpt('disabled_central_pollsters', diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py index 207d9a993..010255b1f 100644 --- a/ceilometer/nova_client.py +++ b/ceilometer/nova_client.py @@ -18,6 +18,7 @@ from functools import wraps from novaclient.v1_1 import client as nova_client from ceilometer.openstack.common import cfg, log +from ceilometer import service # For cfg.CONF.os_* LOG = log.getLogger(__name__)