Updated DEB specs to 2014.1

[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..d9883ffb56b1119dd26d9b078a13ed1a8c75e5f8 100644 (file)
--- a/debian/patches/default-dbconnection-sqlite.patch
+++ b/debian/patches/default-dbconnection-sqlite.patch
@@ -1,11 +1,32 @@
+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
-@@ -262,7 +262,7 @@
+@@ -134,7 +134,7 @@
+ #
  
- ######## defined in ceilometer.storage ########
+ # The file name to use with SQLite (string value)
+-#sqlite_db=ceilometer.sqlite
++sqlite_db=ceilometer.sqlite
  
--# database_connection=mongodb://localhost:27017/ceilometer
-+database_connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite
- #### (StrOpt) Database connection string
+ # If True, SQLite uses synchronous mode (boolean value)
+ #sqlite_synchronous=true
+@@ -619,7 +619,7 @@
  
+ # 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)