Merge "Import service when cfg.CONF.os_* is used"
This commit is contained in:
commit
6500a113fa
@ -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',
|
||||
|
@ -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__)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user