commit 50edca6dd4fa226643e0f714c73c145845d3a6af
author termie <github@anarkystic.com> Wed Jan 11 02:04:39 2012 +0000
committer termie <github@anarkystic.com> Thu Feb 02 15:00:07 2012 -0800
tree 085f537632ec1b2f5f23d0e4199366647a8fb989
parent eacc5953d26a8d1c4b0db4fb4a9cd9b6e201e10b

proper conf

files/keystone.conf

diff --git a/files/keystone.conf b/files/keystone.conf
index 0649e90..1f5c445 100644
--- a/files/keystone.conf
+++ b/files/keystone.conf
@@ -16,7 +16,7 @@
 
 [catalog]
 driver = keystone.backends.templated.TemplatedCatalog
-template_file = ./etc/default_catalog.templates
+template_file = %KEYSTONE_DIR%/etc/default_catalog.templates
 
 [token]
 driver = keystone.backends.kvs.KvsToken

stack.sh

diff --git a/stack.sh b/stack.sh
index 6ce8670..a342a8b 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1354,6 +1354,7 @@
     sudo sed -e "s,%SQL_CONN%,$BASE_SQL_CONN/keystone,g" -i $KEYSTONE_CONF
     sudo sed -e "s,%DEST%,$DEST,g" -i $KEYSTONE_CONF
     sudo sed -e "s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g" -i $KEYSTONE_CONF
+    sudo sed -e "s,%KEYSTONE_DIR%,$KEYSTONE_DIR,g" -i $KEYSTONE_CONF
 
     KEYSTONE_CATALOG=$KEYSTONE_DIR/etc/default_catalog.templates
     cp $FILES/default_catalog.templates $KEYSTONE_CATALOG