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
Fixes call to pkgos_write_admin_creds (glance instead of Ceilometer)
[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 d2346876ecfa91467159d625b01fd5000973e151..8b26aa0aea6157c10a6fd2c3b6772703d9ea6990 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 dpkg-vendor --derives-from ubuntu ; then
+ LIBVIRT_GROUP=libvirtd
+ else
+ LIBVIRT_GROUP=libvirt
+ fi
+
if ! getent group libvirt >/dev/null; then
if ! getent group libvirt >/dev/null; then
- addgroup --system
libvirt
+ 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,8
+34,9
@@
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
@@
-37,7
+44,10
@@
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
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
+ 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
#DEBHELPER#
fi
#DEBHELPER#