diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-24 05:38:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-24 05:38:15 +0000 |
| commit | c252b05fc6c076e7a0f76d3d3444e60b321e1f9e (patch) | |
| tree | 3306f63236069c9b249794ae480ec38845293d69 /doc | |
| parent | 2d1fa1f2765a19e89a8385d7034b6d8087820412 (diff) | |
| parent | 029cd2be676d26fb76b1ccd5062170a435611142 (diff) | |
| download | keystone-c252b05fc6c076e7a0f76d3d3444e60b321e1f9e.tar.gz keystone-c252b05fc6c076e7a0f76d3d3444e60b321e1f9e.tar.xz keystone-c252b05fc6c076e7a0f76d3d3444e60b321e1f9e.zip | |
Merge "add --config-dir=DIR for keystone-all option"
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/man/keystone-all.rst | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/source/man/keystone-all.rst b/doc/source/man/keystone-all.rst index 882e5685..ad578a86 100644 --- a/doc/source/man/keystone-all.rst +++ b/doc/source/man/keystone-all.rst @@ -33,6 +33,12 @@ OPTIONS can be specified, with values in later files taking precedence. The default files used are: ['/etc/keystone/keystone.conf'] + --config-dir=DIR Path to a config directory to pull *.conf files from. + This file set is sorted, so as to provide a + predictable parse order if individual options are + over-ridden. The set is parsed after the file(s), if + any, specified via --config-file, hence over-ridden + options in the directory take precedence. -d, --debug Print debugging output --nodebug The inverse of --debug -v, --verbose Print more verbose output |