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
Added automatic Debconf configuration of RabbitMQ.
[openstack-build/ceilometer-build.git]
/
trusty
/
debian
/
ceilometer-common.postinst.in
diff --git
a/trusty/debian/ceilometer-common.postinst.in
b/trusty/debian/ceilometer-common.postinst.in
index d2346876ecfa91467159d625b01fd5000973e151..9255dcbe2bbd3e8b23d3e8cdd471b5e37346dff6 100644
(file)
--- a/
trusty/debian/ceilometer-common.postinst.in
+++ b/
trusty/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
@@
-29,7
+35,7
@@
libvirt_user_group () {
}
if [ "$1" = "configure" ]; then
}
if [ "$1" = "configure" ]; then
- pkgos_
var_user_group
nova
+ 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
+43,9
@@
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
+ ceilometer-dbsync || true
fi
#DEBHELPER#
fi
#DEBHELPER#