commit 90e7eeb24a95b28033dad045e41b6e4645160d36
author Mark McLoughlin <markmc@redhat.com> Mon Apr 30 20:06:04 2012 +0100
committer Mark McLoughlin <markmc@redhat.com> Mon Apr 30 20:07:22 2012 +0100
tree 32122040dca0c4af18114eaa50cb2b2e06a7d57a
parent a1c87388a45ede40cb150a137560d0aeb50bee0c

Remove duplicate setting of keystone's template_file option

It seems pretty clear that this is a duplicate line

Change-Id: I3390df30cb34ced9fe74bdea387dbc67f5ee8f10

stack.sh

diff --git a/stack.sh b/stack.sh
index 1b69475..c43c9e2 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1663,7 +1663,6 @@
     # Rewrite stock keystone.conf:
     iniset $KEYSTONE_CONF DEFAULT admin_token "$SERVICE_TOKEN"
     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"
     # Configure keystone.conf to use templates
     iniset $KEYSTONE_CONF catalog driver "keystone.catalog.backends.templated.TemplatedCatalog"