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 f6ef568c733437a37f4b26d1fdfdc7011550d0fb..e50b36ba444b1b8c6781c25bf2a6dae2d29f06c5 100644 (file)
--- a/debian/patches/default-dbconnection-sqlite.patch
+++ b/debian/patches/default-dbconnection-sqlite.patch
@@ -1,22 +1,34 @@
-Index: ceilometer/etc/ceilometer/ceilometer.conf.sample
-===================================================================
---- ceilometer.orig/etc/ceilometer/ceilometer.conf.sample      2013-09-06 15:48:23.491575697 -0700
-+++ ceilometer/etc/ceilometer/ceilometer.conf.sample   2013-09-06 15:49:12.755575251 -0700
-@@ -111,7 +111,7 @@
+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
+@@ -126,7 +126,7 @@
  #
  
- # the filename to use with sqlite (string value)
+ # The file name to use with SQLite (string value)
 -#sqlite_db=ceilometer.sqlite
 +sqlite_db=ceilometer.sqlite
  
- # If true, use synchronous mode for sqlite (boolean value)
+ # If True, SQLite uses synchronous mode (boolean value)
  #sqlite_synchronous=true
-@@ -528,7 +528,7 @@
- 
- # The SQLAlchemy connection string used to connect to the
- # database (string value)
+@@ -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
+