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

diff --git a/tools/config/generate_sample.sh b/tools/config/generate_sample.sh
index b5d8ee9869d2f8964d8afec4793adfb7f272de7c..10f6db245beed3d488d2b03ab52371eb3216a9d7 100755 (executable)
--- a/tools/config/generate_sample.sh
+++ b/tools/config/generate_sample.sh
@@ -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

diff --git a/tools/config/oslo.config.generator.rc b/tools/config/oslo.config.generator.rc
index d01f82efc722fe371a8102b1f4592b7db603073e..3d60f7eec99fefac90e923fa6784889f2ca82ffd 100644 (file)
--- a/tools/config/oslo.config.generator.rc
+++ b/tools/config/oslo.config.generator.rc
@@ -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"