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 3e5eef375725877a2aa9c12167cdcc28244544a7..614d3ab902bcd4ad5d1929696c2775de7ced91d9 100644 (file)
--- a/debian/patches/default-dbconnection-sqlite.patch
+++ b/debian/patches/default-dbconnection-sqlite.patch
@@ -1,12 +1,41 @@
-diff -Naurp ceilometer-2013.2.a76.g1d13c31.orig/etc/ceilometer/ceilometer.conf.sample ceilometer-2013.2.a76.g1d13c31/etc/ceilometer/ceilometer.conf.sample
---- ceilometer-2013.2.a76.g1d13c31.orig/etc/ceilometer/ceilometer.conf.sample  2013-06-17 07:37:03.000000000 -0500
-+++ ceilometer-2013.2.a76.g1d13c31/etc/ceilometer/ceilometer.conf.sample       2013-06-17 07:48:41.024448351 -0500
-@@ -88,7 +88,7 @@
+diff --git a/etc/ceilometer/ceilometer.conf.sample b/etc/ceilometer/ceilometer.conf.sample
+index 80964a7..7668dea 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=sqlite:////var/lib/ceilometer/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
+@@ -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)