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"