From c093896d3a7f2d5eee0cbdac58fd924f60ebd577 Mon Sep 17 00:00:00 2001 From: Ivan Udovichenko Date: Tue, 27 Oct 2015 20:07:22 +0200 Subject: [PATCH] Update source package for Ceilometer [MOS 8.0] Change-Id: I4c86286c20c9b9fa2c9680d995f31f79532101be --- .../debian/ceilometer-agent-central.init.in | 3 +- .../debian/ceilometer-agent-central.install | 1 - .../debian/ceilometer-agent-compute.init.in | 3 +- .../debian/ceilometer-agent-compute.install | 1 - trusty/debian/ceilometer-agent-ipmi.init.in | 3 +- trusty/debian/ceilometer-agent-ipmi.install | 1 - trusty/debian/ceilometer-common.postinst.in | 10 ++++- trusty/debian/changelog | 38 +++++++++++++++++++ trusty/debian/control | 21 +++++----- trusty/debian/po/nl.po | 12 ++++-- 10 files changed, 72 insertions(+), 21 deletions(-) delete mode 100644 trusty/debian/ceilometer-agent-central.install delete mode 100644 trusty/debian/ceilometer-agent-compute.install delete mode 100644 trusty/debian/ceilometer-agent-ipmi.install diff --git a/trusty/debian/ceilometer-agent-central.init.in b/trusty/debian/ceilometer-agent-central.init.in index a82e04c..ea50997 100644 --- a/trusty/debian/ceilometer-agent-central.init.in +++ b/trusty/debian/ceilometer-agent-central.init.in @@ -14,4 +14,5 @@ # Author: Thomas Goirand DESC="OpenStack Ceilometer Agent Central" PROJECT_NAME=ceilometer -NAME=${PROJECT_NAME}-agent-central +NAME=${PROJECT_NAME}-polling +DAEMON_ARGS=" --central" \ No newline at end of file diff --git a/trusty/debian/ceilometer-agent-central.install b/trusty/debian/ceilometer-agent-central.install deleted file mode 100644 index 0902295..0000000 --- a/trusty/debian/ceilometer-agent-central.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ceilometer-agent-central diff --git a/trusty/debian/ceilometer-agent-compute.init.in b/trusty/debian/ceilometer-agent-compute.init.in index 4297c2d..648cf6f 100644 --- a/trusty/debian/ceilometer-agent-compute.init.in +++ b/trusty/debian/ceilometer-agent-compute.init.in @@ -14,4 +14,5 @@ # Author: Thomas Goirand DESC="OpenStack Ceilometer Agent Compute" PROJECT_NAME=ceilometer -NAME=${PROJECT_NAME}-agent-compute +NAME=${PROJECT_NAME}-polling +DAEMON_ARGS=" --namespaces compute" diff --git a/trusty/debian/ceilometer-agent-compute.install b/trusty/debian/ceilometer-agent-compute.install deleted file mode 100644 index 773283a..0000000 --- a/trusty/debian/ceilometer-agent-compute.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ceilometer-agent-compute diff --git a/trusty/debian/ceilometer-agent-ipmi.init.in b/trusty/debian/ceilometer-agent-ipmi.init.in index d9d90b5..ea50e8a 100644 --- a/trusty/debian/ceilometer-agent-ipmi.init.in +++ b/trusty/debian/ceilometer-agent-ipmi.init.in @@ -14,4 +14,5 @@ # Author: Thomas Goirand DESC="OpenStack Ceilometer Agent IPMI" PROJECT_NAME=ceilometer -NAME=${PROJECT_NAME}-agent-ipmi +NAME=${PROJECT_NAME}-polling +DAEMON_ARGS=" --namespaces ipmi" diff --git a/trusty/debian/ceilometer-agent-ipmi.install b/trusty/debian/ceilometer-agent-ipmi.install deleted file mode 100644 index e341377..0000000 --- a/trusty/debian/ceilometer-agent-ipmi.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ceilometer-agent-ipmi diff --git a/trusty/debian/ceilometer-common.postinst.in b/trusty/debian/ceilometer-common.postinst.in index 2e84d15..623271b 100644 --- a/trusty/debian/ceilometer-common.postinst.in +++ b/trusty/debian/ceilometer-common.postinst.in @@ -6,10 +6,16 @@ set -e # We need to do that for ceilometer-agent-compute libvirt_user_group () { - if dpkg-vendor --derives-from ubuntu ; then + if getent group libvirt ; then + LIBVIRT_GROUP=libvirt + elif getent group libvirtd ; then LIBVIRT_GROUP=libvirtd else - LIBVIRT_GROUP=libvirt + if dpkg-vendor --derives-from ubuntu ; then + LIBVIRT_GROUP=libvirtd + else + LIBVIRT_GROUP=libvirt + fi fi if ! getent group ${LIBVIRT_GROUP} >/dev/null; then diff --git a/trusty/debian/changelog b/trusty/debian/changelog index b18f0cf..a5f782f 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,41 @@ +ceilometer (1:5.0.0-3~u14.04+mos1) mos8.0; urgency=medium + + * Preserve MOS changes. + + -- Ivan Udovichenko Tue, 27 Oct 2015 20:05:04 +0200 + +ceilometer (1:5.0.0-3) unstable; urgency=medium + + * Uploading to unstable. + + -- Thomas Goirand Fri, 16 Oct 2015 13:37:36 +0000 + +ceilometer (1:5.0.0-2) experimental; urgency=medium + + * Fixed ceilometer-common.postinst. + + -- Thomas Goirand Thu, 15 Oct 2015 19:41:24 +0200 + +ceilometer (1:5.0.0-1) experimental; urgency=medium + + * New upstream release. + * Now checking for libvirt or libvirtd group existance before guessing it + with "dpkg-vendor --derives-from ubuntu". + + -- Thomas Goirand Mon, 12 Oct 2015 10:50:26 +0200 + +ceilometer (1:5.0.0~rc1-1) experimental; urgency=medium + + * New upstream release. + * Get the ceilometer-agent-central use "ceilometer-polling --central". + * Get the ceilometer-agent-compute to use "ceilometer-polling --namespace + compute". + * Updated nl.po + * Now ceilometer-api depends on python-openstackclient. + * Fixed (build-)depends for this release. + + -- Thomas Goirand Sat, 12 Sep 2015 15:26:48 +0000 + ceilometer (1:5.0.0~b2-1~u14.04+mos1) mos8.0; urgency=medium * Source: http://http.debian.net/debian/pool/main/c/ceilometer/ceilometer_5.0.0~b3-1.dsc diff --git a/trusty/debian/control b/trusty/debian/control index 14a7e34..4a71c40 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -9,13 +9,13 @@ Build-Depends: debhelper (>= 9), openstack-pkg-tools (>= 23~), po-debconf, python-all, - python-pbr (>= 1.6), + python-pbr (>= 1.8), python-setuptools, python-sphinx, Build-Depends-Indep: mongodb, python-awsauth, python-babel, - python-ceilometerclient (>= 1.0.13), + python-ceilometerclient (>= 1.5.0), python-contextlib2, python-coverage, python-croniter, @@ -39,7 +39,7 @@ Build-Depends-Indep: mongodb, python-msgpack (>= 0.4.0), python-mysqldb, python-neutronclient (>= 1:2.6.0), - python-novaclient (>= 2:2.26.0), + python-novaclient (>= 2:2.28.1), python-oslo.concurrency (>= 2.3.0), python-oslo.config (>= 1:2.3.0), python-oslo.context (>= 0.2.0), @@ -59,7 +59,7 @@ Build-Depends-Indep: mongodb, python-oslotest (>= 1.10.0), python-pastedeploy, python-pecan (>= 1.0.0), - python-psycopg2, + python-psycopg2 (>= 2.5), python-pymongo (>= 3.0.2), python-pymysql, python-pysnmp4, @@ -69,10 +69,10 @@ Build-Depends-Indep: mongodb, python-sphinxcontrib.docbookrestapi, python-sphinxcontrib.httpdomain, python-sphinxcontrib-pecanwsme, - python-sqlalchemy (>= 0.9.6), + python-sqlalchemy (>= 0.9.9), python-stevedore (>= 1.5.0), python-swiftclient (>= 1:2.2.0), - python-tempest-lib (>= 0.6.1), + python-tempest-lib (>= 0.8.0), python-testscenarios, python-testtools (>= 1.4.0), python-tooz (>= 1.19.0), @@ -92,7 +92,7 @@ Package: python-ceilometer Section: python Architecture: all Depends: libjs-jquery, - python-ceilometerclient (>= 1.0.13), + python-ceilometerclient (>= 1.5.0), python-croniter, python-eventlet (>= 0.17.4), python-glanceclient (>= 1:0.18.0), @@ -109,7 +109,8 @@ Depends: libjs-jquery, python-msgpack (>= 0.4.0), python-mysqldb, python-neutronclient (>= 1:2.6.0), - python-novaclient (>= 2:2.26.0), + python-novaclient (>= 2:2.28.1), + python-openstackclient, python-oslo.concurrency (>= 2.3.0), python-oslo.config (>= 1:2.3.0), python-oslo.context (>= 0.2.0), @@ -126,7 +127,7 @@ Depends: libjs-jquery, python-oslo.utils (>= 2.0.0), python-oslo.vmware (>= 1.16.0), python-pastedeploy, - python-pbr (>= 1.6), + python-pbr (>= 1.8), python-pecan (>= 1.0.0), python-pymongo, python-pymysql, @@ -134,7 +135,7 @@ Depends: libjs-jquery, python-requests (>= 2.5.2), python-retrying, python-six (>= 1.9.0), - python-sqlalchemy (>= 0.9.6), + python-sqlalchemy (>= 0.9.9), python-stevedore (>= 1.5.0), python-swiftclient (>= 1:2.2.0), python-tooz (>= 1.19.0), diff --git a/trusty/debian/po/nl.po b/trusty/debian/po/nl.po index 8a596ba..85981d7 100644 --- a/trusty/debian/po/nl.po +++ b/trusty/debian/po/nl.po @@ -1,14 +1,14 @@ # Dutch translation of ceilometer debconf templates. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the ceilometer package. -# Frans Spiesschaert , 2014. +# Frans Spiesschaert , 2014, 2015. # msgid "" msgstr "" "Project-Id-Version: ceilometer\n" "Report-Msgid-Bugs-To: ceilometer@packages.debian.org\n" "POT-Creation-Date: 2015-06-26 13:18+0000\n" -"PO-Revision-Date: 2014-10-09 22:14+0200\n" +"PO-Revision-Date: 2015-08-29 22:05+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" "Language: nl\n" @@ -16,6 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.6\n" #. Type: boolean #. Description @@ -125,7 +126,7 @@ msgstr "" #. Description #: ../ceilometer-common.templates:2001 msgid "Perform automatic dbsync for Ceilometer?" -msgstr "" +msgstr "Automatisch dbsync voor Ceilometer uitvoeren?" #. Type: boolean #. Description @@ -134,6 +135,9 @@ msgid "" "Ceilometer can automatically run ceilometer-dbsync after installation. For " "it to work, you need an up and running mongodb-server." msgstr "" +"Na installatie kan Ceilometer automatisch de opdracht ceilometer-dbsync " +"uitvoeren. Om dit te doen werken heeft u wel een volledig functionele " +"mongodb-server nodig." #. Type: boolean #. Description @@ -142,6 +146,8 @@ msgid "" "You can change this setting later on by running \"dpkg-reconfigure -plow " "ceilometer\"." msgstr "" +"U kunt deze instelling later wijzigen door de opdracht \"dpkg-reconfigure -" +"plow ceilometer\" uit te voeren." #. Type: string #. Description -- 2.32.3