commit a96a418171f8762e55938186b85443f47c215ad3
author termie <github@anarkystic.com> Mon Jan 09 22:13:29 2012 -0800
committer termie <github@anarkystic.com> Thu Feb 02 14:55:05 2012 -0800
tree beb6ecbda80e5ccfb35d446da15c54a54a2805ff
parent 149ac205ce518c5c16f5d2a84fadf0467c6cdbd9

new keystone support

stack.sh

diff --git a/stack.sh b/stack.sh
index 18d1695..d54d771 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1310,6 +1310,11 @@
     cp $FILES/keystone.conf $KEYSTONE_CONF
     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
+
+    KEYSTONE_CATALOG=$KEYSTONE_DIR/etc/default_catalog.template
+    cp $FILES/default_catalog.template $KEYSTONE_CATALOG
+    sudo sed -e "s,%SERVICE_HOST%,$SERVICE_HOST,g" -i $KEYSTONE_CATALOG
 
     # keystone_data.sh creates our admin user and our ``SERVICE_TOKEN``.
     KEYSTONE_DATA=$KEYSTONE_DIR/bin/keystone_data.sh