From 08fd6ef388f3ade577a4e6010ef6d7904f51e579 Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Fri, 14 Sep 2018 16:12:01 +0200 Subject: [PATCH] agent: Remove unused parameter in load_config This change removes an unused parameter. Change-Id: I376e2823f2af5907f1be2e254c0faddff8116ba7 --- ceilometer/agent.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ceilometer/agent.py b/ceilometer/agent.py index 60570f9af9..91d2067554 100644 --- a/ceilometer/agent.py +++ b/ceilometer/agent.py @@ -48,17 +48,17 @@ class ConfigManagerBase(object): def __init__(self, conf): self.conf = conf - def load_config(self, cfg_file, fallback_cfg_prefix='pipeline/data/'): + def load_config(self, cfg_file): """Load a configuration file and set its refresh values.""" if os.path.exists(cfg_file): cfg_loc = cfg_file else: cfg_loc = self.conf.find_file(cfg_file) - if not cfg_loc and fallback_cfg_prefix is not None: + if not cfg_loc: LOG.debug("No pipeline definitions configuration file found! " "Using default config.") cfg_loc = pkg_resources.resource_filename( - __name__, fallback_cfg_prefix + cfg_file) + __name__, 'pipeline/data/' + cfg_file) else: raise RuntimeError("No configuration file can be found") with open(cfg_loc) as fap: