#!/usr/bin/env bash
# vim: tabstop=4 shiftwidth=4 softtabstop=4

# Copyright 2012 SINA Corporation
# All Rights Reserved.
#
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
#    not use this file except in compliance with the License. You may obtain
#    a copy of the License at
#
#         http://www.apache.org/licenses/LICENSE-2.0
#
#    Unless required by applicable law or agreed to in writing, software
#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
#    License for the specific language governing permissions and limitations
#    under the License.
#
# @author: Zhongyue Luo, Intel Corporation.
#

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

#!/usr/bin/env bash
# vim: tabstop=4 shiftwidth=4 softtabstop=4

# Copyright 2012 SINA Corporation
# All Rights Reserved.
# Author: Zhongyue Luo <lzyeval@gmail.com>
#
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
#    not use this file except in compliance with the License. You may obtain
#    a copy of the License at
#
#         http://www.apache.org/licenses/LICENSE-2.0
#
#    Unless required by applicable law or agreed to in writing, software
#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
#    License for the specific language governing permissions and limitations
#    under the License.

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

PYTHONPATH=./:${PYTHONPATH} \
    python $(dirname "$0")/../../nova/openstack/common/config/generator.py ${FILES} ${BINS} > \
    etc/nova/nova.conf.sample

# Remove compiled files created by imp.import_source()
for bin in ${BINS}; do
    [ -f ${bin}c ] && rm ${bin}c
done

--- 
+++ 
@@ -3,6 +3,7 @@
 
 # Copyright 2012 SINA Corporation
 # All Rights Reserved.
+# Author: Zhongyue Luo <lzyeval@gmail.com>
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -15,19 +16,16 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-#
-# @author: Zhongyue Luo, Intel Corporation.
-#
 
-FILES=$(find nova -type f -name "*.py" ! -path "nova/tests/*" \
-        -exec grep -l "Opt(" {} + | sort -u)
+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
+PYTHONPATH=./:${PYTHONPATH} \
+    python $(dirname "$0")/../../nova/openstack/common/config/generator.py ${FILES} ${BINS} > \
+    etc/nova/nova.conf.sample
 
 # Remove compiled files created by imp.import_source()
 for bin in ${BINS}; do
Refactor conf sample generator script

Optimized grep calls to not create a grep process per file.
Defined variables to enhance readability.

Change-Id: Ic873f2c3b600a737ce54444dec973720c8813285
