Added debconf screen to ask if dbsync should be done (Closes: #787536).

Rewritten-From: 211e91ac0c976dd7386a8f689df1d0de8053aa41

diff --git a/xenial/debian/ceilometer-common.config.in b/xenial/debian/ceilometer-common.config.in
index 170b4fc3d7b32370df709dc8729fdd51af36019c..028d1d890362bd607026ec2258a9b137e3e23b73 100644 (file)
--- a/xenial/debian/ceilometer-common.config.in
+++ b/xenial/debian/ceilometer-common.config.in
@@ -6,6 +6,8 @@ set -e
 
 #PKGOS-INCLUDE#
 
+db_input high ceilometer/configure_db || true
+db_go || true
 pkgos_rabbit_read_conf /etc/ceilometer/ceilometer.conf oslo_messaging_rabbit ceilometer
 pkgos_read_admin_creds /etc/ceilometer/ceilometer.conf keystone_authtoken ceilometer
 

diff --git a/xenial/debian/ceilometer-common.postinst.in b/xenial/debian/ceilometer-common.postinst.in
index 830f965eaafadf3dd5d5a75db474b746abcf287f..f061e5ed2e3918f9e058772b7537dbb235b35dbd 100644 (file)
--- a/xenial/debian/ceilometer-common.postinst.in
+++ b/xenial/debian/ceilometer-common.postinst.in
@@ -44,7 +44,10 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        pkgos_write_new_conf ceilometer ceilometer.conf
        pkgos_rabbit_write_conf /etc/ceilometer/ceilometer.conf oslo_messaging_rabbit ceilometer
        pkgos_write_admin_creds /etc/ceilometer/ceilometer.conf keystone_authtoken ceilometer
-       ceilometer-dbsync || true
+       db_get ceilometer/configure_db
+       if [ "$RET" = "true" ]; then
+               ceilometer-dbsync || true
+       fi
 fi
 
 #DEBHELPER#

diff --git a/xenial/debian/ceilometer-common.templates b/xenial/debian/ceilometer-common.templates
index 66bd1b3e318c275c89ef63e7523d0dbf050e749c..9c2b22e433e7f9e07d1f9595ff1653fb0e57aca4 100644 (file)
--- a/xenial/debian/ceilometer-common.templates
+++ b/xenial/debian/ceilometer-common.templates
@@ -7,6 +7,17 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
+Template: ceilometer/configure_db
+Type: boolean
+Default: false
+_Description: Perform automatic dbsync for Ceilometer?
+ Ceilometer can automatically run ceilometer-dbsync after installation. For it
+ to work, you need an up and running mongodb-server.
+ .
+ You can change this setting later on by running "dpkg-reconfigure -plow
+ ceilometer".
+
+
 Template: ceilometer/rabbit_host
 Type: string
 Default: localhost

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 2780580ed91db8e9cae5a8c0108d79a4b653a4e4..c23fd5798b01522a25be7811b4cb818a5e59cec2 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,9 @@
+ceilometer (2015.1.0-5) unstable; urgency=medium
+
+  * Added debconf screen to ask if dbsync should be done (Closes: #787536).
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 11 Jun 2015 09:18:13 +0200
+
 ceilometer (2015.1.0-4) unstable; urgency=medium
 
   * Added a documentation package with the sphinx docs.