diff options
| author | Morgan Fainberg <m@metacloud.com> | 2014-02-11 17:12:17 -0800 |
|---|---|---|
| committer | Morgan Fainberg <m@metacloud.com> | 2014-02-20 19:18:49 -0800 |
| commit | 23a4fe9ec7b9f3c007793e339110dc43e8781d6f (patch) | |
| tree | 0809e47f1b26b7c075939407854198da0b2dafa1 /tools | |
| parent | 9fbb60dbe0df5bf5d49aeb07ad165fc9f11b0947 (diff) | |
| download | keystone-23a4fe9ec7b9f3c007793e339110dc43e8781d6f.tar.gz | |
Update config options with helpstrings and generate sample
Restructure the common config to include many help strings to
support using the oslo.config auto-generated sample config file.
Closes-Bug: #1229941
Change-Id: If352b3b816b1e7dc8b5fc3b9c1cb2adab187ffda
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/config/check_uptodate.sh | 2 | ||||
| -rw-r--r-- | tools/config/oslo.config.generator.rc | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/config/check_uptodate.sh b/tools/config/check_uptodate.sh index e35dbefa5..1ea2c381d 100755 --- a/tools/config/check_uptodate.sh +++ b/tools/config/check_uptodate.sh @@ -20,6 +20,6 @@ tools/config/generate_sample.sh -b ./ -p ${PROJECT_NAME} -o ${TEMPDIR} if ! diff -u ${TEMPDIR}/${CFGFILE_NAME} ${CFGFILE} then echo "${0##*/}: ${PROJECT_NAME}.conf.sample is not up to date." - echo "${0##*/}: Please run ${0%%${0##*/}}generate_sample.sh." + echo "${0##*/}: Please run 'tox -esample_config -r' (see doc/source/developing.rst for more info)" exit 1 fi diff --git a/tools/config/oslo.config.generator.rc b/tools/config/oslo.config.generator.rc index 938f93788..2f97726a6 100644 --- a/tools/config/oslo.config.generator.rc +++ b/tools/config/oslo.config.generator.rc @@ -1 +1,4 @@ +# Environmental Variables that affect the automatic sample config generation. +# Additions to any of these variables are space delimited. See the "generate_sample.sh" +# script for the variables that can be used. KEYSTONE_CONFIG_GENERATOR_EXTRA_LIBRARIES='keystone oslo.messaging' |