Merge lp:~yolanda.robla/ceilometer/grizzly into lp:~openstack-ubuntu-testing/ceilometer/grizzly

[Yolanda Robla]

Default to sqlite

[James Page (james-page)]

Yolanda

1) modifying configuration files in postinst

Please don't do it this way; instead patch the database_connection into the configuration file in the source tree and ship it as the default configuration file. That way dpkg takes care of maintaining end-user changes to this file.

2) run dbsync as ceilometer user

- su -s /bin/sh -c '/usr/bin/ceilometer-dbsync --os-username ceilometer'
+ su -s /bin/sh -c '/usr/bin/ceilometer-dbsync' ceilometer

review: Needs Fixing

[lp:~yolanda.robla/ceilometer/grizzly]

23. By Yolanda Robla on 2013-03-12

d/patches/default-dbconnection-sqlite.patch: default db to sqlite

24. By Yolanda Robla on 2013-03-12

added patch for configuring sqlite

[James Page (james-page)]

review: Approve

=== modified file 'debian/ceilometer-common.postinst'
--- debian/ceilometer-common.postinst	2013-02-05 14:11:42 +0000
+++ debian/ceilometer-common.postinst	2013-03-12 15:05:32 +0000
@@ -13,15 +13,11 @@
 	chmod 0750 /var/log/ceilometer
 	chown -R ceilometer:ceilometer /var/lib/ceilometer /etc/ceilometer
 
-        # check if mongo exists and auto configure the database
-        if [ -n "`ps aux | grep mongo | grep -v grep`" ]; then
-		# check if the config file hasn't been modified
-		if [ ! -n "`grep "^database_connection\s*\=.*" /etc/ceilometer/ceilometer.conf`" ]; then
-			# modify config file and setup mongo
-			_DATABASE_CONNECTION="mongodb://localhost:27017/ceilometer"
-			echo "database_connection = ${_DATABASE_CONNECTION}" >> /etc/ceilometer/ceilometer.conf
-			su -s /bin/sh -c '/usr/bin/ceilometer-dbsync --os-username ceilometer'
-		fi
+	su -s /bin/sh -c '/usr/bin/ceilometer-dbsync' ceilometer
+
+	if [ -e /var/lib/ceilometer/ceilometer.sqlite ]; then
+		chown ceilometer:ceilometer /var/lib/ceilometer/ceilometer.sqlite
+		chmod 0600 /var/lib/ceilometer/ceilometer.sqlite
 	fi
 fi
 #DEBHELPER#

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-11 22:42:51 +0000
+++ debian/changelog	2013-03-12 15:05:32 +0000
@@ -29,16 +29,15 @@
   [ Yolanda Robla ]
   * d/rules: Copy ceilometer.conf.sample to ceilometer.conf.
   * d/ceilometer-common.install: Install ceilometer.conf and ceilometer-dbsync.
-  * d/ceilometer-common.postinst: Configure mongo connection by default,
-    fixing user/group creation.
+  * d/ceilometer-common.postinst: fixing user/group creation.
   * d/*.upstart: Fix upstart jobs.
   * d/pydist-overrides: Correct pymongo and wsme package names.
-  * d/control: moved mongodb recommends to api and collector
-    packages (LP: #1131627).
+  * d/control: modified mongodb recommends to suggests (LP: #1131627).
   * d/files: copying pipeline.yaml.
   * d/control: fixed typo (LP: #1140309).
+  * d/patches/default-dbconnection-sqlite.patch: default db to sqlite
 
- -- Yolanda Robla <[e-mail]>  Mon, 11 Mar 2013 14:23:00 +0100
+ -- Yolanda Robla <[e-mail]>  Mon, 12 Mar 2013 15:41:00 +0100
 
 ceilometer (0.1-0ubuntu1) quantal; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-03-11 22:42:51 +0000
+++ debian/control	2013-03-12 15:05:32 +0000
@@ -84,7 +84,7 @@
  ceilometer-common (= ${binary:Version}),
  ${misc:Depends},
  ${python:Depends}
-Recommends: mongodb
+Suggests: mongodb
 Description: ceilometer collector service
  Ceilometer aims to deliver a unique point of contact for billing systems to
  aquire all counters they need to establish  customer billing, accross all
@@ -103,7 +103,7 @@
  ceilometer-common (= ${binary:Version}),
  ${misc:Depends},
  ${python:Depends}
-Recommends: mongodb
+Suggests: mongodb
 Description: ceilometer api service
  Ceilometer aims to deliver a unique point of contact for billing systems to
  aquire all counters they need to establish  customer billing, accross all

=== added file 'debian/patches/default-dbconnection-sqlite.patch'
--- debian/patches/default-dbconnection-sqlite.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/default-dbconnection-sqlite.patch	2013-03-12 15:05:32 +0000
@@ -0,0 +1,13 @@
+Index: etc/ceilometer/ceilometer.conf.sample
+===================================================================
+--- a/etc/ceilometer/ceilometer.conf.sample
++++ b/etc/ceilometer/ceilometer.conf.sample
+@@ -262,7 +262,7 @@
+ 
+ ######## defined in ceilometer.storage ########
+ 
+-# database_connection=mongodb://localhost:27017/ceilometer
++database_connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite
+ #### (StrOpt) Database connection string
+ 
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-03-11 22:42:51 +0000
+++ debian/patches/series	2013-03-12 15:05:32 +0000
@@ -1,2 +1,3 @@
 remove-hbase-support.patch
 requests-dep.patch
+default-dbconnection-sqlite.patch