X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=xenial%2Fdebian%2Fceilometer-common.postinst.in;h=e4f3dafd60e30e88ac599ee4c1ea278c872176d2;hb=ab8a07b1a5ffd82e5eddc41877acf0c2411e0297;hp=d2346876ecfa91467159d625b01fd5000973e151;hpb=dadae501bb95f5ce044ac388436ff2378042d3cc;p=openstack-build%2Fceilometer-build.git

diff --git a/xenial/debian/ceilometer-common.postinst.in b/xenial/debian/ceilometer-common.postinst.in
index d234687..e4f3daf 100644
--- a/xenial/debian/ceilometer-common.postinst.in
+++ b/xenial/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
@@ -37,7 +43,8 @@ if [ "$1" = "configure" ]; then
 	pkgos_write_new_conf ceilometer ceilometer.conf
 	pkgos_write_new_conf ceilometer policy.json
 	pkgos_write_new_conf ceilometer sources.json
-	/usr/bin/ceilometer-dbsync || true
+	pkgos_write_new_conf ceilometer pipeline.yaml
+	ceilometer-dbsync || true
 fi
 
 #DEBHELPER#