summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorlong-wang <long.wang@bj.cs2c.com.cn>2012-10-13 21:45:59 +0800
committerlong-wang <long.wang@bj.cs2c.com.cn>2012-10-13 21:45:59 +0800
commit029cd2be676d26fb76b1ccd5062170a435611142 (patch)
tree575f801715e56797983628041cc732eb9b1ec34a /doc
parentf7169c11270dbdeabc56f942b47bc698b54afde5 (diff)
downloadkeystone-029cd2be676d26fb76b1ccd5062170a435611142.tar.gz
keystone-029cd2be676d26fb76b1ccd5062170a435611142.tar.xz
keystone-029cd2be676d26fb76b1ccd5062170a435611142.zip
add --config-dir=DIR for keystone-all option
Change-Id: I0c9e1fdc05714a11accd2845fa031ac8e09b1028
Diffstat (limited to 'doc')
-rw-r--r--doc/source/man/keystone-all.rst6
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