From 5220da6fb06bd8e8605c44306c64c8ec8f2e29ed Mon Sep 17 00:00:00 2001 From: Ivan Udovichenko Date: Tue, 10 Nov 2015 17:45:44 +0200 Subject: [PATCH] Update Ceilometer source package [MOS 8.0] Source: https://anonscm.debian.org/git/openstack/ceilometer.git Related-Bug: #1511763 Closes-Bug: #1515944 Closes-Bug: #1515947 Change-Id: I5588b6f5fdf0874acfc8d07a319a3a70017a588c --- tests/runtests.sh | 9 +++++--- .../debian/ceilometer-agent-central.init.in | 2 +- .../debian/ceilometer-agent-compute.init.in | 2 +- trusty/debian/ceilometer-agent-ipmi.init.in | 2 +- trusty/debian/ceilometer-common.install | 16 ++++++++----- trusty/debian/changelog | 23 +++++++++++++++++++ trusty/debian/control | 5 ++-- 7 files changed, 45 insertions(+), 14 deletions(-) diff --git a/tests/runtests.sh b/tests/runtests.sh index f92d02c..f731f1c 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -56,10 +56,7 @@ else fi ceilometer_binaries=( - ceilometer-agent-central - ceilometer-agent-compute ceilometer-collector - ceilometer-agent-ipmi ceilometer-agent-notification ceilometer-polling ceilometer-api @@ -376,6 +373,12 @@ case ${package_to_test} in ceilometer-agent-ipmi|openstack-ceilometer-ipmi) # Ceilometer-agent-ipmi is not included in common testing # because it is not used in Fuel now + + # Binary does not exist anymore. ceilometer-polling is + # responsible for service start. + # Remove after test rework. + exit 0 + if [ ! -f "/usr/bin/ceilometer-agent-ipmi" ]; then exit_on_error 1 "Ceilometer ipmi binary is missed" fi diff --git a/trusty/debian/ceilometer-agent-central.init.in b/trusty/debian/ceilometer-agent-central.init.in index ea50997..acdebbd 100644 --- a/trusty/debian/ceilometer-agent-central.init.in +++ b/trusty/debian/ceilometer-agent-central.init.in @@ -15,4 +15,4 @@ DESC="OpenStack Ceilometer Agent Central" PROJECT_NAME=ceilometer NAME=${PROJECT_NAME}-polling -DAEMON_ARGS=" --central" \ No newline at end of file +DAEMON_ARGS=" --polling-namespaces central" diff --git a/trusty/debian/ceilometer-agent-compute.init.in b/trusty/debian/ceilometer-agent-compute.init.in index 648cf6f..1707538 100644 --- a/trusty/debian/ceilometer-agent-compute.init.in +++ b/trusty/debian/ceilometer-agent-compute.init.in @@ -15,4 +15,4 @@ DESC="OpenStack Ceilometer Agent Compute" PROJECT_NAME=ceilometer NAME=${PROJECT_NAME}-polling -DAEMON_ARGS=" --namespaces compute" +DAEMON_ARGS=" --polling-namespaces compute" diff --git a/trusty/debian/ceilometer-agent-ipmi.init.in b/trusty/debian/ceilometer-agent-ipmi.init.in index ea50e8a..6f1c590 100644 --- a/trusty/debian/ceilometer-agent-ipmi.init.in +++ b/trusty/debian/ceilometer-agent-ipmi.init.in @@ -15,4 +15,4 @@ DESC="OpenStack Ceilometer Agent IPMI" PROJECT_NAME=ceilometer NAME=${PROJECT_NAME}-polling -DAEMON_ARGS=" --namespaces ipmi" +DAEMON_ARGS=" --polling-namespaces ipmi" diff --git a/trusty/debian/ceilometer-common.install b/trusty/debian/ceilometer-common.install index 568b46e..a612580 100644 --- a/trusty/debian/ceilometer-common.install +++ b/trusty/debian/ceilometer-common.install @@ -3,10 +3,14 @@ /usr/bin/ceilometer-polling /usr/bin/ceilometer-rootwrap /usr/bin/ceilometer-send-sample -etc/ceilometer/api_paste.ini /etc/ceilometer -etc/ceilometer/event_definitions.yaml /etc/ceilometer -etc/ceilometer/pipeline.yaml /etc/ceilometer -etc/ceilometer/policy.json /etc/ceilometer -etc/ceilometer/rootwrap.conf /etc/ceilometer -etc/ceilometer/rootwrap.d/ipmi.filters /etc/ceilometer/rootwrap.d +etc/ceilometer/api_paste.ini /etc/ceilometer +etc/ceilometer/event_definitions.yaml /etc/ceilometer +etc/ceilometer/event_pipeline.yaml /etc/ceilometer +etc/ceilometer/gabbi_pipeline.yaml /etc/ceilometer +etc/ceilometer/gnocchi_archive_policy_map.yaml /etc/ceilometer +etc/ceilometer/gnocchi_resources.yaml /etc/ceilometer +etc/ceilometer/pipeline.yaml /etc/ceilometer +etc/ceilometer/policy.json /etc/ceilometer +etc/ceilometer/rootwrap.conf /etc/ceilometer +etc/ceilometer/rootwrap.d/ipmi.filters /etc/ceilometer/rootwrap.d tools/show_data.py usr/share/doc/ceilometer diff --git a/trusty/debian/changelog b/trusty/debian/changelog index a5f782f..fdae762 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,26 @@ +ceilometer (1:5.0.0-5~u14.04+mos1) mos8.0; urgency=medium + + * d/ceilometer-agent-*.init.in: Fix DAEMON_ARGS for + central, compute and ipmi agents. + * Source: https://anonscm.debian.org/git/openstack/ceilometer.git + * d/ceilometer-common.install: Add event_pipeline.yaml, gabbi_pipeline.yaml, + gnocchi_archive_policy_map.yaml, gnocchi_resources.yaml files + which are now available in stable/liberty branch. + + -- Ivan Udovichenko Tue, 10 Nov 2015 17:45:03 +0200 + +ceilometer (1:5.0.0-5) unstable; urgency=medium + + * Added q-text-as-data as depends for ceilometer-api. + + -- Thomas Goirand Tue, 03 Nov 2015 11:28:44 +0000 + +ceilometer (1:5.0.0-4) unstable; urgency=medium + + * Rebuilt with openstack-pkg-tools to use Keystone API v3. + + -- Thomas Goirand Tue, 03 Nov 2015 09:30:52 +0000 + ceilometer (1:5.0.0-3~u14.04+mos1) mos8.0; urgency=medium * Preserve MOS changes. diff --git a/trusty/debian/control b/trusty/debian/control index 4a71c40..4fbaae2 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -6,7 +6,7 @@ Uploaders: Thomas Goirand , Build-Depends: debhelper (>= 9), dh-python, dh-systemd, - openstack-pkg-tools (>= 23~), + openstack-pkg-tools (>= 37~), po-debconf, python-all, python-pbr (>= 1.8), @@ -110,7 +110,6 @@ Depends: libjs-jquery, python-mysqldb, python-neutronclient (>= 1:2.6.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), @@ -222,9 +221,11 @@ Architecture: all Depends: adduser, ceilometer-common (= ${binary:Version}), debconf, + python-openstackclient, ${misc:Depends}, ${ostack-lsb-base}, ${python:Depends}, +Recommends: q-text-as-data, Suggests: mongodb, Description: OpenStack efficient metering counters system (API service) Ceilometer aims to deliver a Single Point Of Contact for billing systems, -- 2.32.3