From 9dd6d212f0d8fd74c29077a786fb6d770a2a0bba Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 12 Dec 2014 18:27:23 +0100 Subject: [PATCH] Don't use ConfigFilter for lockutils In Neutron, we usually specify lock_path as: lock_path = $state_path/lock It turned out that ConfigFilter does not work correctly with substitution feature, so its usage blocks Neutron adoption of the library. The issue is also not specific to Neutron: any deployer should be able to use substitutions ($smth) in their configuration files without determining whether those configuration options he's interested in are defined as ConfigOpts or ConfigFilter. So the best short term approach to push forward the adoption of the library is to refrain from using ConfigFilter at least until there is consensus on how to support substitution feature with the class. Once oslo.config sorts the issue out, we may get back to using ConfigFilter for lockutils. Change-Id: I7b0b5c840381b2d9afc00ff116fee1d970743183 Closes-Bug: #1399897 --- oslo_concurrency/lockutils.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/oslo_concurrency/lockutils.py b/oslo_concurrency/lockutils.py index e9fd4d7..12d8605 100644 --- a/oslo_concurrency/lockutils.py +++ b/oslo_concurrency/lockutils.py @@ -27,7 +27,6 @@ import time import weakref from oslo.config import cfg -from oslo.config import cfgfilter import retrying import six @@ -53,7 +52,7 @@ _opts = [ ] -CONF = cfgfilter.ConfigFilter(cfg.CONF) +CONF = cfg.CONF CONF.register_opts(_opts, group='oslo_concurrency')