Added exit 0 in debian/ceilometer-common.postinst.in

[openstack-build/ceilometer-build.git] / trusty / debian / ceilometer-common.postinst.in

diff --git a/trusty/debian/ceilometer-common.postinst.in b/trusty/debian/ceilometer-common.postinst.in
index e4f3dafd60e30e88ac599ee4c1ea278c872176d2..2e84d15748c69757d9c164820c4a9fd96f63975d 100644 (file)
--- a/trusty/debian/ceilometer-common.postinst.in
+++ b/trusty/debian/ceilometer-common.postinst.in
@@ -12,7 +12,7 @@ libvirt_user_group () {
                LIBVIRT_GROUP=libvirt
        fi
 
-       if ! getent group libvirt >/dev/null; then
+       if ! getent group ${LIBVIRT_GROUP} >/dev/null; then
                addgroup --system ${LIBVIRT_GROUP}
        fi
 
@@ -34,17 +34,22 @@ libvirt_user_group () {
        fi
 }
 
-if [ "$1" = "configure" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
+       . /usr/share/debconf/confmodule
        pkgos_adduser nova
        pkgos_var_user_group ceilometer
        libvirt_user_group
        adduser ceilometer nova || true
-       adduser ceilometer libvirt || true
+       adduser ceilometer ${LIBVIRT_GROUP} || true
        pkgos_write_new_conf ceilometer ceilometer.conf
-       pkgos_write_new_conf ceilometer policy.json
-       pkgos_write_new_conf ceilometer sources.json
-       pkgos_write_new_conf ceilometer pipeline.yaml
-       ceilometer-dbsync || true
+       pkgos_rabbit_write_conf /etc/ceilometer/ceilometer.conf oslo_messaging_rabbit ceilometer
+       pkgos_write_admin_creds /etc/ceilometer/ceilometer.conf keystone_authtoken ceilometer
+       db_get ceilometer/configure_db
+       if [ "$RET" = "true" ]; then
+               ceilometer-dbsync || true
+       fi
 fi
 
 #DEBHELPER#
+
+exit 0