Sync config module from oslo
Add 'config' to openstack-common so that it syncs from Oslo, move tools/conf -> tools/config to be able to sync from Oslo, and then sync the changes which are proposed in oslo-incubator commit Iee6cc05cad70963f2a151f595ac376c9338f5774. Change-Id: I32a80b0e2aa0e26b9fc78b7546c07e102639374e
This commit is contained in:
parent
76272077ac
commit
252ddedd6d
|
@ -1,5 +1,6 @@
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
module=cliutils
|
module=cliutils
|
||||||
|
module=config
|
||||||
module=config.generator
|
module=config.generator
|
||||||
module=context
|
module=context
|
||||||
module=db
|
module=db
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
TEMPDIR=`mktemp -d`
|
|
||||||
CFGFILE=ironic.conf.sample
|
|
||||||
tools/conf/generate_sample.sh -b ./ -p ironic -o $TEMPDIR
|
|
||||||
if ! diff $TEMPDIR/$CFGFILE etc/ironic/$CFGFILE
|
|
||||||
then
|
|
||||||
echo "E: ironic.conf.sample is not up to date, please run tools/conf/generate_sample.sh"
|
|
||||||
exit 42
|
|
||||||
fi
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
PROJECT_NAME=${PROJECT_NAME:-ironic}
|
||||||
|
CFGFILE_NAME=${PROJECT_NAME}.conf.sample
|
||||||
|
|
||||||
|
if [ -e etc/${PROJECT_NAME}/${CFGFILE_NAME} ]; then
|
||||||
|
CFGFILE=etc/${PROJECT_NAME}/${CFGFILE_NAME}
|
||||||
|
elif [ -e etc/${CFGFILE_NAME} ]; then
|
||||||
|
CFGFILE=etc/${CFGFILE_NAME}
|
||||||
|
else
|
||||||
|
echo "${0##*/}: can not find config file"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
TEMPDIR=`mktemp -d /tmp/${PROJECT_NAME}.XXXXXX`
|
||||||
|
trap "rm -rf $TEMPDIR" EXIT
|
||||||
|
|
||||||
|
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."
|
||||||
|
exit 1
|
||||||
|
fi
|
|
@ -77,11 +77,23 @@ find $TARGETDIR -type f -name "*.pyc" -delete
|
||||||
FILES=$(find $TARGETDIR -type f -name "*.py" ! -path "*/tests/*" \
|
FILES=$(find $TARGETDIR -type f -name "*.py" ! -path "*/tests/*" \
|
||||||
-exec grep -l "Opt(" {} + | sed -e "s/^$BASEDIRESC\///g" | sort -u)
|
-exec grep -l "Opt(" {} + | sed -e "s/^$BASEDIRESC\///g" | sort -u)
|
||||||
|
|
||||||
|
EXTRA_MODULES_FILE="`dirname $0`/oslo.config.generator.rc"
|
||||||
|
if test -r "$EXTRA_MODULES_FILE"
|
||||||
|
then
|
||||||
|
source "$EXTRA_MODULES_FILE"
|
||||||
|
fi
|
||||||
|
|
||||||
export EVENTLET_NO_GREENDNS=yes
|
export EVENTLET_NO_GREENDNS=yes
|
||||||
|
|
||||||
OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs)
|
OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs)
|
||||||
[ "$OS_VARS" ] && eval "unset \$OS_VARS"
|
[ "$OS_VARS" ] && eval "unset \$OS_VARS"
|
||||||
|
DEFAULT_MODULEPATH=ironic.openstack.common.config.generator
|
||||||
MODULEPATH=ironic.openstack.common.config.generator
|
MODULEPATH=${MODULEPATH:-$DEFAULT_MODULEPATH}
|
||||||
OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample
|
OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample
|
||||||
python -m $MODULEPATH $FILES > $OUTPUTFILE
|
python -m $MODULEPATH $FILES > $OUTPUTFILE
|
||||||
|
|
||||||
|
# Hook to allow projects to append custom config file snippets
|
||||||
|
CONCAT_FILES=$(ls $BASEDIR/tools/config/*.conf.sample 2>/dev/null)
|
||||||
|
for CONCAT_FILE in $CONCAT_FILES; do
|
||||||
|
cat $CONCAT_FILE >> $OUTPUTFILE
|
||||||
|
done
|
2
tox.ini
2
tox.ini
|
@ -21,7 +21,7 @@ downloadcache = ~/cache/pip
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
commands =
|
commands =
|
||||||
flake8 {posargs}
|
flake8 {posargs}
|
||||||
{toxinidir}/tools/conf/check_uptodate.sh
|
{toxinidir}/tools/config/check_uptodate.sh
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
|
|
Loading…
Reference in New Issue