Attachment 695652 Details for Bug 909286 – Auto select dist config at correct precedence

[patch] Auto select dist config at correct precedence

openstack-dist-config.diff (text/plain), 1.29 KB, created by Pádraig Brady on 2013-02-10 02:56:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pádraig Brady

Created: 2013-02-10 02:56:39 UTC

Size: 1.29 KB

patch

obsolete

>This will lookup /usr/share/$project/$project-dist.conf
>in the correct precedence order by default.
>For example from command line utils which don't specify
>the --config-file option.  Note if daemon init scripts
>explicitly specify a --config-file then they must specify
>all required.
>
>For reference the precendence order is that later --config-file
>options will override settings from previous ones.
>So when no --config-file option is specified, we insert
>the "dist" config file as the first to be parsed,
>and settings from there are overridden by any from
>/etc/$project/$project.conf and /etc/$prog.conf respectively.
>
>For completeness settings in configs from --config-dir take precedence
>over any of the --config-file settings above.
>diff --git a/nova/openstack/common/cfg.py b/nova/openstack/common/cfg.py
>index 3f6a482..87e477e 100644
>--- a/nova/openstack/common/cfg.py
>+++ b/nova/openstack/common/cfg.py
>@@ -448,6 +448,8 @@ def find_config_files(project=None, prog=None, extension='.conf'):
> 
>     config_files = []
>     if project:
>+        config_files.append(_search_dirs(['/usr/share/%s/' % project],
>+                                         project, '-dist%s' % extension))
>         config_files.append(_search_dirs(cfg_dirs, project, extension))
>     config_files.append(_search_dirs(cfg_dirs, prog, extension))
>

Actions: View | Diff

Attachments on bug 909286: 695652