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
Removed Add_oslo.db_to_config_generator.patch applied 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 757725f13c2bfb92d2a5349ba6281cebf143cd7f..903cf1ca648b4eb26d36bf208d155e3107bea144 100644
(file)
--- 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 () {
# We need to do that for ceilometer-agent-compute
libvirt_user_group () {
- if ! getent group libvirt >/dev/null; then
- addgroup --system libvirt
+ if dpkg-vendor --derives-from ubuntu ; then
+ LIBVIRT_GROUP=libvirtd
+ else
+ LIBVIRT_GROUP=libvirt
+ fi
+
+ if ! getent group ${LIBVIRT_GROUP} >/dev/null; then
+ addgroup --system ${LIBVIRT_GROUP}
fi
# user and group libvirt runs qemu/kvm instances with
fi
# user and group libvirt runs qemu/kvm instances with
@@
-28,15
+34,16
@@
libvirt_user_group () {
fi
}
fi
}
-if [ "$1" = "configure" ]; then
- pkgos_var_user_group nova
+if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
+ . /usr/share/debconf/confmodule
+ pkgos_adduser nova
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_
rabbit_write_conf /etc/ceilometer/ceilometer.conf DEFAULT ceilometer
+ pkgos_write_
admin_creds /etc/ceilometer/ceilometer.conf keystone_authtoken ceilometer
ceilometer-dbsync || true
fi
ceilometer-dbsync || true
fi