]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commit
Dynamically create cinder.conf.sample
authorKendall Nelson <kjnelson@us.ibm.com>
Thu, 13 Aug 2015 15:17:36 +0000 (10:17 -0500)
committerWalter A. Boring IV (hemna) <walter.boring@hpe.com>
Fri, 18 Sep 2015 17:27:27 +0000 (17:27 +0000)
commit111a056c0f212ed38ff6127f6c9b9dc13fd536f0
tree581c63f6c2be8f9899eaaf30852b0b44e94aa539
parent351a432f592b42ad30e3c87b6520693b0c5df44a
Dynamically create cinder.conf.sample

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
cinder/config/cinder-config-generator.conf [new file with mode: 0644]
cinder/config/generate_cinder_opts.py [new file with mode: 0644]
setup.cfg
tools/config/check_uptodate.sh
tools/config/generate_sample.sh
tools/config/oslo.config.generator.rc [deleted file]
tox.ini