Merge lp:~yolanda.robla/ceilometer/refresh-db-patch into lp:~openstack-ubuntu-testing/ceilometer/havana

[Yolanda Robla]

Updated db connection in ceilometer.conf

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-31 15:29:18 +0000
+++ debian/changelog	2013-06-05 09:59:49 +0000
@@ -1,3 +1,9 @@
+ceilometer (2013.2~b1-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/default-dbconnection-sqlite.patch: updated db section
+
+ -- Yolanda Robla <[e-mail]>  Wed, 05 Jun 2013 11:46:29 +0200
+
 ceilometer (2013.2~b1-0ubuntu1) saucy; urgency=low
 
   * New upstream release.

=== modified file 'debian/patches/default-dbconnection-sqlite.patch'
--- debian/patches/default-dbconnection-sqlite.patch	2013-05-28 11:37:17 +0000
+++ debian/patches/default-dbconnection-sqlite.patch	2013-06-05 09:59:49 +0000
@@ -1,11 +1,12 @@
-diff -Naurp ceilometer-2013.2.a175.gae9ccbd.orig/etc/ceilometer/ceilometer.conf.sample ceilometer-2013.2.a175.gae9ccbd/etc/ceilometer/ceilometer.conf.sample
---- ceilometer-2013.2.a175.gae9ccbd.orig/etc/ceilometer/ceilometer.conf.sample	2013-05-27 20:11:35.000000000 -0500
-+++ ceilometer-2013.2.a175.gae9ccbd/etc/ceilometer/ceilometer.conf.sample	2013-05-27 20:16:48.569019601 -0500
-@@ -497,6 +497,7 @@
- 
- # Database connection string (string value)
- #database_connection=mongodb://localhost:27017/ceilometer
-+database_connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite
- 
- 
- #
+Index: ceilometer/etc/ceilometer/ceilometer.conf.sample
+===================================================================
+--- a/etc/ceilometer/ceilometer.conf.sample   2013-06-04 17:46:52.000000000 +0000
++++ b/etc/ceilometer/ceilometer.conf.sample        2013-06-05 09:36:45.074895860 +0000
+@@ -517,6 +517,7 @@
+ # The SQLAlchemy connection string used to connect to the
+ # database (string value)
+ #connection=sqlite:////common/db/$sqlite_db
++connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite
+ 
+ # timeout before idle sql connections are reaped (integer
+ # value)