--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openstack/cinder/patches/12-generate_sample.patch	Fri Feb 05 17:54:17 2016 -0500
@@ -0,0 +1,45 @@
+In-house patch to update the generate_sample script and related data
+files for use with Solaris.
+
+--- cinder-2015.1.2/tools/config/generate_sample.sh.orig	2015-10-13 09:27:35.000000000 -0700
++++ cinder-2015.1.2/tools/config/generate_sample.sh	2016-01-31 22:28:46.003791619 -0800
+@@ -1,5 +1,7 @@
+ #!/usr/bin/env bash
+ 
++PATH=/usr/gnu/bin:/usr/bin
++
+ # Generate sample configuration for your project.
+ #
+ # Aside from the command line flags, it also respects a config file which
+@@ -97,6 +99,7 @@ fi
+ BASEDIRESC=`echo $BASEDIR | sed -e 's/\//\\\\\//g'`
+ find $TARGETDIR -type f -name "*.pyc" -delete
+ FILES=$(find $TARGETDIR -type f -name "*.py" ! -path "*/tests/*" \
++        ! -name test.py \
+         -exec grep -l "Opt(" {} + | sed -e "s/^$BASEDIRESC\///g" | sort -u)
+ 
+ RC_FILE="`dirname $0`/oslo.config.generator.rc"
+@@ -136,9 +139,3 @@ CONCAT_FILES=$(ls $BASEDIR/tools/config/
+ 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
+--- cinder-2015.1.2/tools/config/oslo.config.generator.rc.orig	2015-10-13 09:27:35.000000000 -0700
++++ cinder-2015.1.2/tools/config/oslo.config.generator.rc	2016-01-31 22:29:40.025594671 -0800
+@@ -1,2 +1,9 @@
+-export CINDER_CONFIG_GENERATOR_EXTRA_MODULES="keystonemiddleware.auth_token"
+-export CINDER_CONFIG_GENERATOR_EXTRA_LIBRARIES="oslo_concurrency oslo.messaging oslo_db oslo.db.concurrency"
++export CINDER_CONFIG_GENERATOR_EXTRA_LIBRARIES=" \
++    keystonemiddleware.auth_token \
++    oslo.concurrency \
++    oslo.db \
++    oslo.db.concurrency \
++    oslo.log \
++    oslo.messaging \
++    oslo.middleware \
++"