Refresh against ceilometer master
There have been a few changes in ceilometer repository, specifically https://review.openstack.org/#/c/596378/, which warrant an update post-Rocky. Change-Id: I9e127e0976be4c44bd56a977a755564a88fc1b44
This commit is contained in:
parent
d54179f00f
commit
ee80e0f54c
|
@ -30,7 +30,6 @@ import ceilometer.ipmi.platform.intel_node_manager
|
|||
import ceilometer.ipmi.pollsters
|
||||
import ceilometer.keystone_client
|
||||
import ceilometer.meter.notifications
|
||||
import ceilometer.middleware
|
||||
import ceilometer.monasca_opts
|
||||
import ceilometer.neutron_client
|
||||
import ceilometer.notification
|
||||
|
@ -71,8 +70,7 @@ def list_opts():
|
|||
# This have been removed due to a recursive import issue
|
||||
return [
|
||||
('DEFAULT',
|
||||
itertools.chain(ceilometer.polling.manager.OPTS,
|
||||
ceilometer.compute.virt.inspector.OPTS,
|
||||
itertools.chain(ceilometer.compute.virt.inspector.OPTS,
|
||||
ceilometer.compute.virt.libvirt.utils.OPTS,
|
||||
ceilometer.objectstore.swift.OPTS,
|
||||
ceilometer.pipeline.base.OPTS,
|
||||
|
|
|
@ -1,61 +0,0 @@
|
|||
# Copyright 2012-2014 eNovance <licensing@enovance.com>
|
||||
# (c) Copyright 2018 SUSE LLC
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# 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 sys
|
||||
|
||||
from oslo_config import cfg
|
||||
import oslo_i18n
|
||||
from oslo_log import log
|
||||
# from oslo_reports import guru_meditation_report as gmr
|
||||
|
||||
from ceilometer import keystone_client
|
||||
from ceilometer import messaging
|
||||
from ceilometer import opts
|
||||
from ceilometer import sample
|
||||
from ceilometer import utils
|
||||
from ceilometer import version
|
||||
|
||||
|
||||
def prepare_service(argv=None, config_files=None, conf=None):
|
||||
if argv is None:
|
||||
argv = sys.argv
|
||||
|
||||
if conf is None:
|
||||
conf = cfg.ConfigOpts()
|
||||
|
||||
oslo_i18n.enable_lazy()
|
||||
for group, options in opts.list_opts():
|
||||
conf.register_opts(list(options),
|
||||
group=None if group == "DEFAULT" else group)
|
||||
keystone_client.register_keystoneauth_opts(conf)
|
||||
log.register_options(conf)
|
||||
log_levels = (conf.default_log_levels +
|
||||
['futurist=INFO', 'neutronclient=INFO',
|
||||
'keystoneclient=INFO'])
|
||||
log.set_defaults(default_log_levels=log_levels)
|
||||
|
||||
conf(argv[1:], project='ceilometer', validate_default_values=True,
|
||||
version=version.version_info.version_string(),
|
||||
default_config_files=config_files)
|
||||
|
||||
keystone_client.post_register_keystoneauth_opts(conf)
|
||||
|
||||
log.setup(conf, 'ceilometer')
|
||||
utils.setup_root_helper(conf)
|
||||
sample.setup(conf)
|
||||
|
||||
# gmr.TextGuruMeditation.setup_autorun(version)
|
||||
messaging.setup()
|
||||
return conf
|
Loading…
Reference in New Issue