Update specs to v. 2014.1.b3

[openstack-build/ceilometer-build.git] / debian / patches / default-dbconnection-sqlite.patch

diff --git a/debian/patches/default-dbconnection-sqlite.patch b/debian/patches/default-dbconnection-sqlite.patch
index 0c7e007862659bf994d03856a2b898655db5bca1..e50b36ba444b1b8c6781c25bf2a6dae2d29f06c5 100644 (file)
--- a/debian/patches/default-dbconnection-sqlite.patch
+++ b/debian/patches/default-dbconnection-sqlite.patch
@@ -1,11 +1,34 @@
+From ced115328cee880146cc1380f9a97356e6700aae Mon Sep 17 00:00:00 2001
+From: Dmitry Burmistrov <dburmistrov@mirantis.com>
+Date: Fri, 14 Mar 2014 11:21:24 +0400
+Subject: [PATCH 1/2] default-dbconnection-sqlite
+
+---
+ etc/ceilometer/ceilometer.conf.sample |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/etc/ceilometer/ceilometer.conf.sample b/etc/ceilometer/ceilometer.conf.sample
+index 81ffd8a..88fd045 100644
 --- a/etc/ceilometer/ceilometer.conf.sample
 +++ b/etc/ceilometer/ceilometer.conf.sample
-@@ -262,7 +262,7 @@
+@@ -126,7 +126,7 @@
+ #
  
- ######## defined in ceilometer.storage ########
- 
--# database_connection=mongodb://localhost:27017/ceilometer
-+database_connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite
- #### (StrOpt) Database connection string
+ # The file name to use with SQLite (string value)
+-#sqlite_db=ceilometer.sqlite
++sqlite_db=ceilometer.sqlite
  
+ # If True, SQLite uses synchronous mode (boolean value)
+ #sqlite_synchronous=true
+@@ -618,7 +618,7 @@
+ # Deprecated group/name - [DEFAULT]/sql_connection
+ # Deprecated group/name - [DATABASE]/sql_connection
+ # Deprecated group/name - [sql]/connection
+-#connection=sqlite:////ceilometer/openstack/common/db/$sqlite_db
++connection=sqlite:////var/lib/ceilometer/$sqlite_db
  
+ # The SQLAlchemy connection string used to connect to the
+ # slave database (string value)
+-- 
+1.7.9.5
+