From: Ivan Udovichenko Date: Wed, 22 Mar 2017 16:37:19 +0000 (+0200) Subject: [MOS 10.0] Update ceilometer package X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F49%2F32449%2F1;p=openstack-build%2Fceilometer-build.git [MOS 10.0] Update ceilometer package * Remove dpkg-dev dependency with the function which required it. Change-Id: Ie1fcc6bb1562c5d85538d03e61beaf4386d0ddae Related-Bug: #1673680 --- diff --git a/xenial/debian/ceilometer-common.postinst.in b/xenial/debian/ceilometer-common.postinst.in index 623271b..f982fa3 100644 --- a/xenial/debian/ceilometer-common.postinst.in +++ b/xenial/debian/ceilometer-common.postinst.in @@ -4,47 +4,10 @@ set -e #PKGOS-INCLUDE# -# We need to do that for ceilometer-agent-compute -libvirt_user_group () { - if getent group libvirt ; then - LIBVIRT_GROUP=libvirt - elif getent group libvirtd ; then - LIBVIRT_GROUP=libvirtd - else - if dpkg-vendor --derives-from ubuntu ; then - LIBVIRT_GROUP=libvirtd - else - LIBVIRT_GROUP=libvirt - fi - fi - - if ! getent group ${LIBVIRT_GROUP} >/dev/null; then - addgroup --system ${LIBVIRT_GROUP} - fi - - # user and group libvirt runs qemu/kvm instances with - if ! getent group kvm >/dev/null; then - addgroup --quiet --system kvm - fi - if ! getent passwd libvirt-qemu >/dev/null; then - adduser --quiet \ - --system \ - --ingroup kvm \ - --quiet \ - --disabled-login \ - --disabled-password \ - --home /var/lib/libvirt \ - --no-create-home \ - -gecos "Libvirt Qemu" \ - libvirt-qemu - fi -} - 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 adduser ceilometer ${LIBVIRT_GROUP} || true pkgos_write_new_conf ceilometer ceilometer.conf diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 325c045..30e6e53 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -1,3 +1,10 @@ +ceilometer (1:7.0.2-2~u16.04+mos0) mos10.0; urgency=medium + + * Remove dpkg-dev dependency with the function which required it. + (LP#1673680) + + -- Ivan Udovichenko Wed, 22 Mar 2017 18:36:06 +0200 + ceilometer (1:7.0.2-1~u16.04+mos0) mos10.0; urgency=medium * Sync changes. (PROD#9364) diff --git a/xenial/debian/control b/xenial/debian/control index 8ab883a..aa5bdbb 100644 --- a/xenial/debian/control +++ b/xenial/debian/control @@ -168,7 +168,6 @@ Description: OpenStack efficient metering counters system - Python libraries Package: ceilometer-common Architecture: all Depends: adduser, - dpkg-dev, python-ceilometer (= ${binary:Version}), ${misc:Depends}, ${python:Depends},