From 23a4fe9ec7b9f3c007793e339110dc43e8781d6f Mon Sep 17 00:00:00 2001 From: Morgan Fainberg Date: Tue, 11 Feb 2014 17:12:17 -0800 Subject: 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 --- tools/config/check_uptodate.sh | 2 +- tools/config/oslo.config.generator.rc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'tools') 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' -- cgit v1.2.1