openstack
/
designate
Code Issues Proposed changes

Stop abusing state_path in find_config 

It makes no sense to look for configuration in the same location where
state is stored. Replacing state_path by pybasedir keeps current
behaviour while allowing us to change the default state_path from
Designate's install location to /var/lib/designate in a subsequent
patchset.

Change-Id: I82fed1ddde0dbc7340a6ad5dcb80dbcba72b8358
This commit is contained in:
Artom Lifshitz 2014-02-17 14:16:05 -05:00
parent 1e6e3f2152
commit 4dcde5f80e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
designate/utils.py
View File

@ -44,9 +44,9 @@ def find_config(config_path):
"""
possible_locations = [
config_path,
os.path.join(cfg.CONF.state_path, "etc", "designate", config_path),
os.path.join(cfg.CONF.state_path, "etc", config_path),
os.path.join(cfg.CONF.state_path, config_path),
os.path.join(cfg.CONF.pybasedir, "etc", "designate", config_path),
os.path.join(cfg.CONF.pybasedir, "etc", config_path),
os.path.join(cfg.CONF.pybasedir, config_path),
"/etc/designate/%s" % config_path,
]