X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fceilometer-common.postinst.in;h=903cf1ca648b4eb26d36bf208d155e3107bea144;hb=72ef22890a6e9c923c9c772a18ed07c4f2c43e28;hp=c9b77a739e803f31ae363eb9676b2ef5f2245566;hpb=ced9f276a139dbc07bf6a4d52acfac29ba2e1c52;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/ceilometer-common.postinst.in b/trusty/debian/ceilometer-common.postinst.in
index c9b77a7..903cf1c 100644
--- 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
 
@@ -40,13 +40,10 @@ 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_write_admin_creds /etc/ceilometer/ceilometer.conf keystone_authtoken glance
+	pkgos_write_admin_creds /etc/ceilometer/ceilometer.conf keystone_authtoken ceilometer
 	ceilometer-dbsync || true
 fi