Browse code
Merge "Remove duplicate setting of keystone's template_file option"
Jenkins authored on 2012/05/01 08:46:23Showing 1 changed files
| ... | ... |
@@ -1663,7 +1663,6 @@ if is_service_enabled key; then |
| 1663 | 1663 |
# Rewrite stock keystone.conf: |
| 1664 | 1664 |
iniset $KEYSTONE_CONF DEFAULT admin_token "$SERVICE_TOKEN" |
| 1665 | 1665 |
iniset $KEYSTONE_CONF sql connection "$BASE_SQL_CONN/keystone?charset=utf8" |
| 1666 |
- iniset $KEYSTONE_CONF catalog template_file "$KEYSTONE_CATALOG" |
|
| 1667 | 1666 |
iniset $KEYSTONE_CONF ec2 driver "keystone.contrib.ec2.backends.sql.Ec2" |
| 1668 | 1667 |
# Configure keystone.conf to use templates |
| 1669 | 1668 |
iniset $KEYSTONE_CONF catalog driver "keystone.catalog.backends.templated.TemplatedCatalog" |