summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@gmail.com>2012-03-02 10:50:57 -0600
committerDolph Mathews <dolph.mathews@gmail.com>2012-03-06 11:20:11 -0600
commitb68051cd13cc71ebd15cd478afedf0c5d07ebd4e (patch)
tree94fd2b8dbe2d26f262ec652ae3bd9bb313a8ef8f
parent6621c79b06fc2848072e59d22d1224ae3a0c593a (diff)
downloadkeystone-b68051cd13cc71ebd15cd478afedf0c5d07ebd4e.tar.gz
keystone-b68051cd13cc71ebd15cd478afedf0c5d07ebd4e.tar.xz
keystone-b68051cd13cc71ebd15cd478afedf0c5d07ebd4e.zip
Renamed sqlite files (bug 944951)
Change-Id: Iae7aa34de0bf68da9e422719605753634cc0d113
-rw-r--r--etc/keystone.conf2
-rw-r--r--keystone/common/sql/util.py2
-rw-r--r--tests/backend_sql.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/etc/keystone.conf b/etc/keystone.conf
index 9020ea65..d1d51d74 100644
--- a/etc/keystone.conf
+++ b/etc/keystone.conf
@@ -16,7 +16,7 @@ use_syslog = False
# syslog_log_facility = LOG_LOCAL0
[sql]
-connection = sqlite:///bla.db
+connection = sqlite:///keystone.db
idle_timeout = 200
min_pool_size = 5
max_pool_size = 10
diff --git a/keystone/common/sql/util.py b/keystone/common/sql/util.py
index a181c284..5dfe585e 100644
--- a/keystone/common/sql/util.py
+++ b/keystone/common/sql/util.py
@@ -12,7 +12,7 @@ CONF = config.CONF
def setup_test_database():
# TODO(termie): be smart about this
try:
- os.unlink('bla.db')
+ os.unlink('test.db')
except Exception:
pass
migration.db_sync()
diff --git a/tests/backend_sql.conf b/tests/backend_sql.conf
index cb246194..bbe4343a 100644
--- a/tests/backend_sql.conf
+++ b/tests/backend_sql.conf
@@ -1,5 +1,5 @@
[sql]
-connection = sqlite:///bla.db
+connection = sqlite:///test.db
idle_timeout = 200
min_pool_size = 5
max_pool_size = 10