1 In-house patch to update the generate_sample script and related data |
|
2 files for use with Solaris. |
|
3 |
|
4 --- cinder-2015.1.2/tools/config/generate_sample.sh.orig 2015-10-13 09:27:35.000000000 -0700 |
|
5 +++ cinder-2015.1.2/tools/config/generate_sample.sh 2016-01-31 22:28:46.003791619 -0800 |
|
6 @@ -1,5 +1,7 @@ |
|
7 #!/usr/bin/env bash |
|
8 |
|
9 +PATH=/usr/gnu/bin:/usr/bin |
|
10 + |
|
11 # Generate sample configuration for your project. |
|
12 # |
|
13 # Aside from the command line flags, it also respects a config file which |
|
14 @@ -97,6 +99,7 @@ fi |
|
15 BASEDIRESC=`echo $BASEDIR | sed -e 's/\//\\\\\//g'` |
|
16 find $TARGETDIR -type f -name "*.pyc" -delete |
|
17 FILES=$(find $TARGETDIR -type f -name "*.py" ! -path "*/tests/*" \ |
|
18 + ! -name test.py \ |
|
19 -exec grep -l "Opt(" {} + | sed -e "s/^$BASEDIRESC\///g" | sort -u) |
|
20 |
|
21 RC_FILE="`dirname $0`/oslo.config.generator.rc" |
|
22 @@ -136,9 +139,3 @@ CONCAT_FILES=$(ls $BASEDIR/tools/config/ |
|
23 for CONCAT_FILE in $CONCAT_FILES; do |
|
24 cat $CONCAT_FILE >> $OUTPUTFILE |
|
25 done |
|
26 - |
|
27 -# Now we need to get externals |
|
28 -oslo-config-generator \ |
|
29 ---namespace oslo_concurrency --namespace oslo_db \ |
|
30 ---namespace oslo_messaging --namespace policy \ |
|
31 ---namespace keystonemiddleware.auth_token >> $OUTPUTFILE |
|
32 --- cinder-2015.1.2/tools/config/oslo.config.generator.rc.orig 2015-10-13 09:27:35.000000000 -0700 |
|
33 +++ cinder-2015.1.2/tools/config/oslo.config.generator.rc 2016-01-31 22:29:40.025594671 -0800 |
|
34 @@ -1,2 +1,9 @@ |
|
35 -export CINDER_CONFIG_GENERATOR_EXTRA_MODULES="keystonemiddleware.auth_token" |
|
36 -export CINDER_CONFIG_GENERATOR_EXTRA_LIBRARIES="oslo_concurrency oslo.messaging oslo_db oslo.db.concurrency" |
|
37 +export CINDER_CONFIG_GENERATOR_EXTRA_LIBRARIES=" \ |
|
38 + keystonemiddleware.auth_token \ |
|
39 + oslo.concurrency \ |
|
40 + oslo.db \ |
|
41 + oslo.db.concurrency \ |
|
42 + oslo.log \ |
|
43 + oslo.messaging \ |
|
44 + oslo.middleware \ |
|
45 +" |
|