X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fpatches%2Fdefault-dbconnection-sqlite.patch;h=d9883ffb56b1119dd26d9b078a13ed1a8c75e5f8;hb=50a35c8e0af05e7f307e9430ad68ef0920cc2318;hp=f6ef568c733437a37f4b26d1fdfdc7011550d0fb;hpb=e1a973dc6c81cef2cc8f44ffe4784c6007d686f1;p=openstack-build%2Fceilometer-build.git

diff --git a/debian/patches/default-dbconnection-sqlite.patch b/debian/patches/default-dbconnection-sqlite.patch
index f6ef568..d9883ff 100644
--- a/debian/patches/default-dbconnection-sqlite.patch
+++ b/debian/patches/default-dbconnection-sqlite.patch
@@ -1,22 +1,32 @@
-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 @@
+diff --git a/etc/ceilometer/ceilometer.conf.sample b/etc/ceilometer/ceilometer.conf.sample
+index 4281a67..ff9cbe2 100644
+--- a/etc/ceilometer/ceilometer.conf.sample
++++ b/etc/ceilometer/ceilometer.conf.sample
+@@ -134,7 +134,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 @@
+@@ -619,7 +619,7 @@
  
- # The SQLAlchemy connection string used to connect to the
- # database (string value)
+ # The backend to use for db (string value)
+ # Deprecated group/name - [DEFAULT]/db_backend
+-#backend=sqlalchemy
++backend=sqlalchemy
+ 
+ 
+ #
+@@ -631,7 +631,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)