summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-17 23:21:27 +0000
committerGerrit Code Review <review@openstack.org>2013-06-17 23:21:27 +0000
commit73dfbeba11aab5337b72f2af9515eed5dae093e9 (patch)
treeae26051866157b9e9f0ec86cb150577cae3b05f8
parentf27a4f306183017da5dfceeb7d1dfa8cf4cbb433 (diff)
parentc5a805c8c741ecf5ca9c17a1469383ce9d710371 (diff)
downloadnova-73dfbeba11aab5337b72f2af9515eed5dae093e9.tar.gz
nova-73dfbeba11aab5337b72f2af9515eed5dae093e9.tar.xz
nova-73dfbeba11aab5337b72f2af9515eed5dae093e9.zip
Merge "Remove bin lookup in conf sample generator"
-rwxr-xr-xtools/conf/generate_sample.sh8
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/conf/generate_sample.sh b/tools/conf/generate_sample.sh
index 89bae8ab8..44d4672b6 100755
--- a/tools/conf/generate_sample.sh
+++ b/tools/conf/generate_sample.sh
@@ -21,15 +21,9 @@
FILES=$(find nova -type f -name "*.py" ! -path "nova/tests/*" \
-exec grep -l "Opt(" {} + | sort -u)
-BINS=$(echo bin/nova-* | grep -v nova-rootwrap)
export EVENTLET_NO_GREENDNS=yes
MODULEPATH=$(dirname "$0")/../../nova/openstack/common/config/generator.py
OUTPUTPATH=etc/nova/nova.conf.sample
-PYTHONPATH=./:${PYTHONPATH} python $MODULEPATH $FILES $BINS > $OUTPUTPATH
-
-# Remove compiled files created by imp.import_source()
-for bin in ${BINS}; do
- [ -f ${bin}c ] && rm ${bin}c
-done
+PYTHONPATH=./:${PYTHONPATH} python $MODULEPATH $FILES > $OUTPUTPATH