111a056c0f
As it stands, the opts.py file that is passed into
oslo-config-generator isn't being generated dynamically
and the old way of generating the cinder.conf.sample is
dependent on oslo-incubator which Cinder is trying to
move away from. oslo-config-generator works differently
than oslo-incubator so a number of changes had to be made
in order to make this switch.
This patch adds the config directory to Cinder and in it
are two files:
-generate_cinder_opts.py that will take the
results of a grep command to create the opts.py
file to be passed into oslo-config-generator.
-cinder.conf which is the new configuration for
oslo-config-generator. The file is inside the config
directory to be consistent with other projects.
Some changes were made to the generate_sample.sh file in
order to give the base directories and target directories
to the generate_cinder_opts.py program.
tox.ini was edited to remove the checkonly option because
all that needs to happen in check_uptodate.sh is a check to
ensure that the cinder.conf.sample is actually being
generated with no issues.
All options were removed from the check_uptodate.sh
because they were unnecessary given the new, more simple
way of generating the cinder.conf.sample.
setup.cfg was also edited in order to add information
oslo-config-generator needs to run.
Co-Authored By: Jay Bryant <jsbryant@us.ibm.com>
Co-Authored By: Jacob Gregor <jgregor@us.ibm.com>
Change-Id: I643dbe5675ae9280e204f691781e617266f570d5
Closes-Bug: 1473768
Closes-Bug: 1437904
Closes-Bug: 1381563
27 lines
614 B
Bash
Executable File
27 lines
614 B
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
CHECKONLY=0
|
|
if [ "$1" == "--checkonly" ]; then
|
|
CHECKONLY=1
|
|
fi
|
|
|
|
PROJECT_NAME=${PROJECT_NAME:-cinder}
|
|
CFGFILE_NAME=${PROJECT_NAME}.conf.sample
|
|
|
|
|
|
TEMPDIR=`mktemp -d /tmp/${PROJECT_NAME}.XXXXXX`
|
|
trap "rm -rf $TEMPDIR" EXIT
|
|
|
|
tools/config/generate_sample.sh from_tox
|
|
|
|
if [ -e etc/${PROJECT_NAME}/${CFGFILE_NAME} ]; then
|
|
CFGFILE=etc/${PROJECT_NAME}/${CFGFILE_NAME}
|
|
elif [ -e cinder/opts.py]; then
|
|
echo -en "\n\nWARNING: Found cinder/opts.py file. \n"
|
|
echo -en "Check for generate_cinder_opts.py failure.\n\n"
|
|
exit 1
|
|
else
|
|
echo "${0##*/}: Can't find config file."
|
|
exit 1
|
|
fi
|