From 029cd2be676d26fb76b1ccd5062170a435611142 Mon Sep 17 00:00:00 2001 From: long-wang Date: Sat, 13 Oct 2012 21:45:59 +0800 Subject: [PATCH] add --config-dir=DIR for keystone-all option Change-Id: I0c9e1fdc05714a11accd2845fa031ac8e09b1028 --- doc/source/man/keystone-all.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/source/man/keystone-all.rst b/doc/source/man/keystone-all.rst index 882e568540..ad578a864c 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