openstack/devstack
Code Issues Proposed changes

Merge "Remove duplicate setting of keystone's template_file option"

Browse Source
This commit is contained in:
Jenkins 2012-04-30 23:46:23 +00:00 committed by Gerrit Code Review
commit d51527783f
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stack.sh
View File

@ -1663,7 +1663,6 @@ if is_service_enabled key; then
# Rewrite stock keystone.conf: # Rewrite stock keystone.conf:
iniset $KEYSTONE_CONF DEFAULT admin_token "$SERVICE_TOKEN" iniset $KEYSTONE_CONF DEFAULT admin_token "$SERVICE_TOKEN"
iniset $KEYSTONE_CONF sql connection "$BASE_SQL_CONN/keystone?charset=utf8" iniset $KEYSTONE_CONF sql connection "$BASE_SQL_CONN/keystone?charset=utf8"
iniset $KEYSTONE_CONF catalog template_file "$KEYSTONE_CATALOG"
iniset $KEYSTONE_CONF ec2 driver "keystone.contrib.ec2.backends.sql.Ec2" iniset $KEYSTONE_CONF ec2 driver "keystone.contrib.ec2.backends.sql.Ec2"
# Configure keystone.conf to use templates # Configure keystone.conf to use templates
iniset $KEYSTONE_CONF catalog driver "keystone.catalog.backends.templated.TemplatedCatalog" iniset $KEYSTONE_CONF catalog driver "keystone.catalog.backends.templated.TemplatedCatalog"