Merge lp:~james-page/ceilometer/fixup-dbsync into lp:~ubuntu-server-dev/ceilometer/icehouse

[James Page]

=== modified file 'debian/ceilometer-common.postinst'
--- debian/ceilometer-common.postinst	2013-03-12 15:01:59 +0000
+++ debian/ceilometer-common.postinst	2014-04-01 16:33:23 +0000
@@ -1,23 +1,26 @@
 #!/bin/sh -e
 
 if [ "$1" = "configure" ]; then
-	if ! getent group ceilometer > /dev/null 2>&1; then
-        	addgroup --system ceilometer >/dev/null
-    	fi
-
-    	if ! getent passwd ceilometer > /dev/null 2>&1; then
-        	adduser --system --home /var/lib/ceilometer --ingroup ceilometer --no-create-home --shell /bin/false ceilometer
-    	fi
-
-	chown -R ceilometer:adm /var/log/ceilometer
-	chmod 0750 /var/log/ceilometer
-	chown -R ceilometer:ceilometer /var/lib/ceilometer /etc/ceilometer
-
-	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
+    if ! getent group ceilometer > /dev/null 2>&1; then
+        addgroup --system ceilometer >/dev/null
+    fi
+
+    if ! getent passwd ceilometer > /dev/null 2>&1; then
+        adduser --system --home /var/lib/ceilometer --ingroup ceilometer --no-create-home --shell /bin/false ceilometer
+    fi
+
+    chown -R ceilometer:adm /var/log/ceilometer
+    chmod 0750 /var/log/ceilometer
+    chown -R ceilometer:ceilometer /var/lib/ceilometer /etc/ceilometer
+
+    if grep -qE "^(sql_)?connection.*sqlite.*" /etc/ceilometer/ceilometer.conf
+    then
+        su -s /bin/sh -c '/usr/bin/ceilometer-dbsync' ceilometer
+    fi
+
+    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	2014-03-31 19:11:35 +0000
+++ debian/changelog	2014-04-01 16:33:23 +0000
@@ -1,3 +1,10 @@
+ceilometer (2014.1~rc1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * d/ceilometer-common.postinst: Only run db sync process if default sqlite
+    connection is configured in /etc/ceilometer/ceilometer.conf (LP: #1182964).
+
+ -- James Page <[e-mail]>  Tue, 01 Apr 2014 17:23:52 +0100
+
 ceilometer (2014.1~rc1-0ubuntu1) trusty; urgency=medium
 
   * New upstream release.