From 300ea1e97b129c1dac9f9d4aca3a0879e998633c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 11 Aug 2025 23:25:28 +0900 Subject: [PATCH] Refactor rootwrap utilities Replace redundant global variable by direct loading of config option. Change-Id: I0705a7b2ef27bad75c01def19501ab59fbea1993 Signed-off-by: Takashi Kajinami --- ceilometer/cmd/polling.py | 2 +- ceilometer/service.py | 2 -- ceilometer/utils.py | 14 +++----------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/ceilometer/cmd/polling.py b/ceilometer/cmd/polling.py index 1a1cf88471..42e781cac7 100644 --- a/ceilometer/cmd/polling.py +++ b/ceilometer/cmd/polling.py @@ -98,7 +98,7 @@ def create_heartbeat_service(worker_id, conf, queue=None): def main(): sm = cotyledon.ServiceManager() conf = _prepare_config() - priv_context.init(root_helper=shlex.split(utils._get_root_helper())) + priv_context.init(root_helper=shlex.split(utils.get_root_helper(conf))) oslo_config_glue.setup(sm, conf) if conf.polling.heartbeat_socket_dir is not None: diff --git a/ceilometer/service.py b/ceilometer/service.py index 667db46061..ba8dce0892 100644 --- a/ceilometer/service.py +++ b/ceilometer/service.py @@ -24,7 +24,6 @@ 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 @@ -53,7 +52,6 @@ def prepare_service(argv=None, config_files=None, conf=None): keystone_client.post_register_keystoneauth_opts(conf) log.setup(conf, 'ceilometer') - utils.setup_root_helper(conf) sample.setup(conf) gmr_opts.set_defaults(conf) diff --git a/ceilometer/utils.py b/ceilometer/utils.py index a86ebeee0b..49253155ae 100644 --- a/ceilometer/utils.py +++ b/ceilometer/utils.py @@ -23,24 +23,16 @@ import threading from oslo_config import cfg from oslo_utils import timeutils -ROOTWRAP_CONF = "/etc/ceilometer/rootwrap.conf" - OPTS = [ cfg.StrOpt('rootwrap_config', - default=ROOTWRAP_CONF, + default='/etc/ceilometer/rootwrap.conf', help='Path to the rootwrap configuration file to ' 'use for running commands as root'), ] -def _get_root_helper(): - global ROOTWRAP_CONF - return 'sudo ceilometer-rootwrap %s' % ROOTWRAP_CONF - - -def setup_root_helper(conf): - global ROOTWRAP_CONF - ROOTWRAP_CONF = conf.rootwrap_config +def get_root_helper(conf): + return 'sudo ceilometer-rootwrap %s' % conf.rootwrap_config def spawn_thread(target, *args, **kwargs):