Update specs to v. 2014.1.rc

[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 e50b36ba444b1b8c6781c25bf2a6dae2d29f06c5..614d3ab902bcd4ad5d1929696c2775de7ced91d9 100644 (file)
--- a/debian/patches/default-dbconnection-sqlite.patch
+++ b/debian/patches/default-dbconnection-sqlite.patch
@@ -1,14 +1,5 @@
-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
+index 80964a7..7668dea 100644
 --- a/etc/ceilometer/ceilometer.conf.sample
 +++ b/etc/ceilometer/ceilometer.conf.sample
 @@ -126,7 +126,7 @@
@@ -20,15 +11,31 @@ index 81ffd8a..88fd045 100644
  
  # If True, SQLite uses synchronous mode (boolean value)
  #sqlite_synchronous=true
-@@ -618,7 +618,7 @@
+@@ -148,7 +148,7 @@
+ 
+ 
+ #
+-# Options defined in ceilometer.openstack.common.lockutils
++#Options defined in ceilometer.openstack.common.lockutils
+ #
+ 
+ # Whether to disable inter-process locks. (boolean value)
+@@ -598,7 +598,7 @@
+ 
+ # The backend to use for db (string value)
+ # Deprecated group/name - [DEFAULT]/db_backend
+-#backend=sqlalchemy
++backend=sqlalchemy
+ 
+ 
+ #
+@@ -610,7 +610,8 @@
  # 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
-