Fix library includes for config generator

Noticed today while working on fixing issues
with the config generator that oslo_policy
had been added in the wrong location for
pulling the config options in to the config
generator.

This fix moves the items that had been put in
oslo.config.generator.rc but were missing in generate_sample.sh
over to the appropriate location.  I also removed the option for
importing additional libraries in oslo.config.generator.rc
given that it will not work.

I am still working on a longer term solution, but
we really should get this fixed so we can generate sample
config files again.

Change-Id: I2c14c1acc49d68305dca5a3dedc686ab07ed2088
This commit is contained in:
Jay S. Bryant 2015-06-24 14:35:38 -05:00
parent 843c5efe8e
commit dec236a39e
2 changed files with 2 additions and 1 deletions

@ -153,4 +153,6 @@ oslo-config-generator \
--namespace oslo.i18n \
--namespace oslo.middleware \
--namespace policy \
--namespace oslo.policy \
--namespace oslo.db.concurrency \
--namespace keystonemiddleware.auth_token | grep -v '^\[DEFAULT\]' >> $OUTPUTFILE

@ -1,2 +1 @@
export CINDER_CONFIG_GENERATOR_EXTRA_MODULES="keystonemiddleware.auth_token"
export CINDER_CONFIG_GENERATOR_EXTRA_LIBRARIES="oslo_concurrency oslo.messaging oslo_db oslo.db.concurrency oslo_policy"