summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Griffith <john.griffith8@gmail.com>2015-04-23 12:07:12 -0600
committerMike Perez <thingee@gmail.com>2015-04-24 02:59:13 +0000
commit5987bb2290f629e59b0bcced2f8fe22cdeb9cc6d (patch)
treefe39b1091730239b9efe150781f469cccadc43e4
parent0756db04b4d68c2316e39043bd90441b834eb018 (diff)
downloadcinder-5987bb2290f629e59b0bcced2f8fe22cdeb9cc6d.tar.gz
Add external genconfig calls2015.1.0rc22015.1.0
After moving to oslo.config we still were using incubator config generator. This was ok, but the problem is we haven't been pulling config options from the oslo libs. This is a hack that just appends external lib calls and appends those options to the sample file being built. Change-Id: I2634b20ef4abd3bf7990f845d59ad3d208db234f (cherry picked from commit 51a22591a44932463847ed3247899db32ac49444) Closes-Bug: #1447380
-rwxr-xr-xtools/config/generate_sample.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/config/generate_sample.sh b/tools/config/generate_sample.sh
index 0416d2aee..26984a8ac 100755
--- a/tools/config/generate_sample.sh
+++ b/tools/config/generate_sample.sh
@@ -136,3 +136,9 @@ CONCAT_FILES=$(ls $BASEDIR/tools/config/*.conf.sample 2>/dev/null)
for CONCAT_FILE in $CONCAT_FILES; do
cat $CONCAT_FILE >> $OUTPUTFILE
done
+
+# Now we need to get externals
+oslo-config-generator \
+--namespace oslo_concurrency --namespace oslo_db \
+--namespace oslo_messaging --namespace policy \
+--namespace keystonemiddleware.auth_token >> $OUTPUTFILE