proper conf

This commit is contained in:
termie
2012-01-11 02:04:39 +00:00
parent eacc5953d2
commit 50edca6dd4
2 changed files with 2 additions and 1 deletions

View File

@@ -16,7 +16,7 @@ driver = keystone.backends.sql.SqlIdentity
[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

View File

@@ -1354,6 +1354,7 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
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