[MOS 9.0] Update ceilometer package

* Remove dpkg-dev dependency with the function which required it.

Change-Id: I60883a96ea80de89acba623463fec859d1f477ca
Related-Bug: #1673680

diff --git a/trusty/debian/ceilometer-common.postinst.in b/trusty/debian/ceilometer-common.postinst.in
index 623271b3d33ef4809480c44ac76e3497a34a7e11..f982fa37afe07521d887b0a1fcd348447a5c26bd 100644 (file)
--- a/trusty/debian/ceilometer-common.postinst.in
+++ b/trusty/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/trusty/debian/changelog b/trusty/debian/changelog
index 0ff0f8824bad488b8d935997a6dba376e6232826..ce2d9655be5aab9877e0c6c4c55908d32e52c7f3 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+ceilometer (1:6.0.0-5~u14.04+mos0) mos9.0; urgency=medium
+
+  * Remove dpkg-dev dependency with the function which required it.
+    (LP#1673680)
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Wed, 22 Mar 2017 14:53:28 +0200
+
 ceilometer (1:6.0.0-4~u14.04+mos0) mos9.0; urgency=medium
 
   * Rebuild with new version of openstack-pkg-tools package.

diff --git a/trusty/debian/control b/trusty/debian/control
index 9f42699ee6291ac467b93cca9bcc7cfce8888e71..333585b61488eb825b6d015bd5f068dcb1ab6071 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -164,7 +164,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},