* Now checking for libvirt or libvirtd group existance before guessing it

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

diff --git a/xenial/debian/ceilometer-common.postinst.in b/xenial/debian/ceilometer-common.postinst.in
index 5a8ecfde8d0d7d776434a3d30d0dc9548f7c5b6f..346f2c626732c41d5cbd226ca06c62d17a724330 100644 (file)
--- a/xenial/debian/ceilometer-common.postinst.in
+++ b/xenial/debian/ceilometer-common.postinst.in
@@ -6,10 +6,16 @@ set -e
 
 # We need to do that for ceilometer-agent-compute
 libvirt_user_group () {
-       if dpkg-vendor --derives-from ubuntu ; then
-               LIBVIRT_GROUP=libvirtd
-       else
+       if getent group libvirt ; then
                LIBVIRT_GROUP=libvirt
+       elif getent group libvirtd ; then
+               LIBVIRT_GROUP=libvirtd
+       elif
+               if dpkg-vendor --derives-from ubuntu ; then
+                       LIBVIRT_GROUP=libvirtd
+               else
+                       LIBVIRT_GROUP=libvirt
+               fi
        fi
 
        if ! getent group ${LIBVIRT_GROUP} >/dev/null; then
@@ -40,14 +46,16 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        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
-       pkgos_rabbit_write_conf /etc/ceilometer/ceilometer.conf DEFAULT ceilometer
+       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#
+
+exit 0