Code Review
/
openstack-build
/
ceilometer-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add debian/function.sh as it's gone away upstream.
[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 8b26aa0aea6157c10a6fd2c3b6772703d9ea6990..623271b3d33ef4809480c44ac76e3497a34a7e11 100644
(file)
--- a/
xenial/debian/ceilometer-common.postinst.in
+++ b/
xenial/debian/ceilometer-common.postinst.in
@@
-6,13
+6,19
@@
set -e
# We need to do that for ceilometer-agent-compute
libvirt_user_group () {
# We need to do that for ceilometer-agent-compute
libvirt_user_group () {
- if dpkg-vendor --derives-from ubuntu ; then
+ if getent group libvirt ; then
+ LIBVIRT_GROUP=libvirt
+ elif getent group libvirtd ; then
LIBVIRT_GROUP=libvirtd
else
LIBVIRT_GROUP=libvirtd
else
- LIBVIRT_GROUP=libvirt
+ if dpkg-vendor --derives-from ubuntu ; then
+ LIBVIRT_GROUP=libvirtd
+ else
+ LIBVIRT_GROUP=libvirt
+ fi
fi
fi
- if ! getent group
libvirt
>/dev/null; then
+ if ! getent group
${LIBVIRT_GROUP}
>/dev/null; then
addgroup --system ${LIBVIRT_GROUP}
fi
addgroup --system ${LIBVIRT_GROUP}
fi
@@
-40,14
+46,16
@@
if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
pkgos_var_user_group ceilometer
libvirt_user_group
adduser ceilometer nova || true
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 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
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#
fi
#DEBHELPER#
+
+exit 0