From dec236a39e0b88e4ed5d5160da60e9ba654e4c7a Mon Sep 17 00:00:00 2001 From: "Jay S. Bryant" Date: Wed, 24 Jun 2015 14:35:38 -0500 Subject: [PATCH] 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 --- tools/config/generate_sample.sh | 2 ++ tools/config/oslo.config.generator.rc | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/config/generate_sample.sh b/tools/config/generate_sample.sh index b5d8ee9869d..10f6db245be 100755 --- 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 d01f82efc72..3d60f7eec99 100644 --- 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"