Added automatic Debconf configuration of RabbitMQ.

[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 e88759ed8513ffaf06dbaf975467ab772e56844b..9255dcbe2bbd3e8b23d3e8cdd471b5e37346dff6 100644 (file)
--- a/trusty/debian/ceilometer-common.postinst.in
+++ b/trusty/debian/ceilometer-common.postinst.in
@@ -6,8 +6,14 @@ 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
+               LIBVIRT_GROUP=libvirt
+       fi
+
        if ! getent group libvirt >/dev/null; then
-               addgroup --system libvirt
+               addgroup --system ${LIBVIRT_GROUP}
        fi
 
        # user and group libvirt runs qemu/kvm instances with
@@ -29,7 +35,7 @@ libvirt_user_group () {
 }
 
 if [ "$1" = "configure" ]; then
-       pkgos_var_user_group nova
+       pkgos_adduser nova
        pkgos_var_user_group ceilometer
        libvirt_user_group
        adduser ceilometer nova || true
@@ -38,6 +44,7 @@ if [ "$1" = "configure" ]; then
        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
        ceilometer-dbsync || true
 fi