From: Dmitry Burmistrov Date: Fri, 20 Jun 2014 13:16:22 +0000 (+0400) Subject: Update specs to v. 2014.1.1 X-Git-Tag: openstack-ci/fuel/2014.1.1/5.1.1~5 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8eae4ebe951524c2961c98ac8f02a36f8b8d735b;p=openstack-build%2Fceilometer-build.git Update specs to v. 2014.1.1 Change-Id: I71e8d9e5354c33417e1f9b2501c745d737b4a6cf --- diff --git a/debian/ceilometer-common.postinst b/debian/ceilometer-common.postinst index f61445c..27ca0a2 100644 --- a/debian/ceilometer-common.postinst +++ b/debian/ceilometer-common.postinst @@ -1,23 +1,26 @@ #!/bin/sh -e if [ "$1" = "configure" ]; then - if ! getent group ceilometer > /dev/null 2>&1; then - addgroup --system ceilometer >/dev/null - fi + if ! getent group ceilometer > /dev/null 2>&1; then + addgroup --system ceilometer >/dev/null + fi - if ! getent passwd ceilometer > /dev/null 2>&1; then - adduser --system --home /var/lib/ceilometer --ingroup ceilometer --no-create-home --shell /bin/false ceilometer - fi + if ! getent passwd ceilometer > /dev/null 2>&1; then + adduser --system --home /var/lib/ceilometer --ingroup ceilometer --no-create-home --shell /bin/false ceilometer + fi - chown -R ceilometer:adm /var/log/ceilometer - chmod 0750 /var/log/ceilometer - chown -R ceilometer:ceilometer /var/lib/ceilometer /etc/ceilometer + chown -R ceilometer:adm /var/log/ceilometer + chmod 0750 /var/log/ceilometer + chown -R ceilometer:ceilometer /var/lib/ceilometer /etc/ceilometer - su -s /bin/sh -c '/usr/bin/ceilometer-dbsync' ceilometer + if grep -qE "^(sql_)?connection.*sqlite.*" /etc/ceilometer/ceilometer.conf + then + su -s /bin/sh -c '/usr/bin/ceilometer-dbsync' ceilometer + fi - if [ -e /var/lib/ceilometer/ceilometer.sqlite ]; then - chown ceilometer:ceilometer /var/lib/ceilometer/ceilometer.sqlite - chmod 0600 /var/lib/ceilometer/ceilometer.sqlite - fi + if [ -e /var/lib/ceilometer/ceilometer.sqlite ]; then + chown ceilometer:ceilometer /var/lib/ceilometer/ceilometer.sqlite + chmod 0600 /var/lib/ceilometer/ceilometer.sqlite + fi fi #DEBHELPER# diff --git a/debian/changelog b/debian/changelog index 04298bd..0ebb209 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,45 @@ -ceilometer (2014.1~rc1-0ubuntu1~cloud0) precise-icehouse; urgency=medium +ceilometer (2014.1.1-0ubuntu1) trusty; urgency=medium - * New update for the Ubuntu Cloud Archive. + * Resynchronize with stable/icehouse (a1ec218) (LP: #1328134): + - [84635e6] Fix testing gate due to new keystoneclient release + - [c52904d] Fix network notifications of neutron bulk creation + - [06eb8bc] Sync kombu_reconnect_delay from Oslo + - [d247af3] Updated from global requirements + - [82eed26] Disable specifying alarm itself in combination rule + - [94c12fd] Adapt failing tests for latest wsme version + - [a1ec218] Use known protocol scheme in keystone tests - -- Openstack Ubuntu Testing Bot Tue, 01 Apr 2014 00:14:21 -0400 + -- Corey Bryant Mon, 09 Jun 2014 14:49:20 -0400 + +ceilometer (2014.1-0ubuntu1.1) trusty; urgency=medium + + * d/p/fix-requirements.patch: Drop required version of pecan to 0.3.0 + inline with the version that is provided in 14.04 (LP: #1317147). + + -- James Page Fri, 16 May 2014 12:11:00 -0400 + +ceilometer (2014.1-0ubuntu1) trusty; urgency=medium + + * New upstream release (LP: #1299055). + + -- Corey Bryant Wed, 16 Apr 2014 13:04:53 -0400 + +ceilometer (2014.1~rc3-0ubuntu1) trusty; urgency=medium + + * New upstream release candidate (LP: #1299055). + + -- Chuck Short Tue, 15 Apr 2014 20:29:38 -0400 + +ceilometer (2014.1~rc2-0ubuntu1) trusty; urgency=medium + + [ James Page ] + * d/ceilometer-common.postinst: Only run db sync process if default sqlite + connection is configured in /etc/ceilometer/ceilometer.conf (LP: #1182964). + + [ Chuck Short ] + * New upstream release (LP: #1299055). + + -- Chuck Short Tue, 08 Apr 2014 15:41:50 -0400 ceilometer (2014.1~rc1-0ubuntu1) trusty; urgency=medium diff --git a/debian/control b/debian/control index e2e2044..fe6a990 100644 --- a/debian/control +++ b/debian/control @@ -246,6 +246,4 @@ Description: Ceilometer notification agent . (A ceilometer is an instrument that measures cloud coverage.) . - This package contains the arlarm notifier daemon. - - + This package contains the alarm notifier daemon. diff --git a/debian/patches/default-dbconnection-sqlite.patch b/debian/patches/default-dbconnection-sqlite.patch index d9883ff..614d3ab 100644 --- a/debian/patches/default-dbconnection-sqlite.patch +++ b/debian/patches/default-dbconnection-sqlite.patch @@ -1,8 +1,8 @@ diff --git a/etc/ceilometer/ceilometer.conf.sample b/etc/ceilometer/ceilometer.conf.sample -index 4281a67..ff9cbe2 100644 +index 80964a7..7668dea 100644 --- a/etc/ceilometer/ceilometer.conf.sample +++ b/etc/ceilometer/ceilometer.conf.sample -@@ -134,7 +134,7 @@ +@@ -126,7 +126,7 @@ # # The file name to use with SQLite (string value) @@ -11,7 +11,16 @@ index 4281a67..ff9cbe2 100644 # If True, SQLite uses synchronous mode (boolean value) #sqlite_synchronous=true -@@ -619,7 +619,7 @@ +@@ -148,7 +148,7 @@ + + + # +-# Options defined in ceilometer.openstack.common.lockutils ++#Options defined in ceilometer.openstack.common.lockutils + # + + # Whether to disable inter-process locks. (boolean value) +@@ -598,7 +598,7 @@ # The backend to use for db (string value) # Deprecated group/name - [DEFAULT]/db_backend @@ -20,7 +29,7 @@ index 4281a67..ff9cbe2 100644 # -@@ -631,7 +631,8 @@ +@@ -610,7 +610,8 @@ # Deprecated group/name - [DEFAULT]/sql_connection # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection diff --git a/debian/patches/fix-requirements.patch b/debian/patches/fix-requirements.patch index ed28076..e23b8cb 100644 --- a/debian/patches/fix-requirements.patch +++ b/debian/patches/fix-requirements.patch @@ -1,15 +1,26 @@ -Description: Disabled pynsmp. -Author: Chuck Short +Description: Disable pynsmp and set min version of pecan/six. +Author: Corey Bryant Forwarded: Not needed. -diff --git a/requirements.txt b/requirements.txt -index 654f568..e7d023d 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -17,7 +17,6 @@ oslo.config>=1.2.0 +Index: ceilometer/requirements.txt +=================================================================== +--- ceilometer.orig/requirements.txt 2014-06-13 10:13:20.380556854 -0400 ++++ ceilometer/requirements.txt 2014-06-13 10:42:20.980503789 -0400 +@@ -16,8 +16,7 @@ + oslo.config>=1.2.0 oslo.vmware>=0.2 # Apache-2.0 pbr>=0.6,<1.0 - pecan>=0.4.5 +-pecan>=0.4.5 -pysnmp>=4.2.1,<5.0.0 ++pecan>=0.3.0 python-ceilometerclient>=1.0.6 python-glanceclient>=0.9.0 python-keystoneclient>=0.7.0 +@@ -26,7 +25,7 @@ + pytz>=2010h + PyYAML>=3.1.0 + requests>=1.1 +-six>=1.6.0 ++six>=1.5.2 + SQLAlchemy>=0.7.8,<=0.9.99 + sqlalchemy-migrate>=0.8.2,!=0.8.4 + stevedore>=0.14 diff --git a/debian/patches/fix-setup-requirements.patch b/debian/patches/fix-setup-requirements.patch deleted file mode 100644 index 085f3b9..0000000 --- a/debian/patches/fix-setup-requirements.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 95aa5bdfe07b287e5671db4b0a242d84b981bfc5 Mon Sep 17 00:00:00 2001 -From: Dmitry Burmistrov -Date: Fri, 14 Mar 2014 11:21:53 +0400 -Subject: [PATCH 2/2] fix-setup-requirements - ---- - requirements.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/requirements.txt b/requirements.txt -index 7b6c237..c96fd6a 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -29,5 +29,5 @@ six>=1.5.2 - SQLAlchemy>=0.7.8,<=0.8.99 - sqlalchemy-migrate>=0.8.2 - stevedore>=0.14 --WebOb>=1.2.3 -+WebOb>=1.2.3,<1.4 - WSME>=0.6 --- -1.7.9.5 - diff --git a/debian/patches/revert-keystone-compat.patch b/debian/patches/revert-keystone-compat.patch deleted file mode 100644 index 44210ce..0000000 --- a/debian/patches/revert-keystone-compat.patch +++ /dev/null @@ -1,82 +0,0 @@ -Description: Revert keystone 0.4.0 patch from upstream. -Author: James Page -Bug: https://bugs.launchpad.net/ceilometer/+bug/1239651 -Origin: revert, https://github.com/openstack/ceilometer/commit/c0a3f3cd69eb609216a07111067478f3755cceb4 - ---- a/etc/ceilometer/ceilometer.conf.sample -+++ b/etc/ceilometer/ceilometer.conf.sample -@@ -742,10 +742,6 @@ connection=sqlite:////var/lib/ceilometer - # server. (boolean value) - #http_connect_timeout= - --# How many times are we trying to reconnect when communicating --# with Identity API Server. (integer value) --#http_request_max_retries=3 -- - # Allows to pass in the name of a fake http_handler callback - # function used instead of httplib.HTTPConnection or - # httplib.HTTPSConnection. Useful for unit testing where -@@ -778,13 +774,6 @@ connection=sqlite:////var/lib/ceilometer - # (string value) - #keyfile= - --# A PEM encoded Certificate Authority to use when verifying --# HTTPs connections. Defaults to system CAs. (string value) --#cafile= -- --# Verify HTTPS connections. (boolean value) --#insecure=false -- - # Directory used to cache files related to PKI tokens (string - # value) - #signing_dir= ---- a/tests/api/v2/test_acl_scenarios.py -+++ b/tests/api/v2/test_acl_scenarios.py -@@ -27,7 +27,6 @@ from ceilometer import sample - from ceilometer.api import acl - from ceilometer.publisher import rpc - from ceilometer.tests import db as tests_db --from ceilometer.openstack.common import timeutils - - from .base import FunctionalTest - -@@ -38,8 +37,12 @@ VALID_TOKEN2 = '4562138218392832' - - - class FakeMemcache(object): -- @staticmethod -- def get(key): -+ def __init__(self): -+ self.set_key = None -+ self.set_value = None -+ self.token_expiration = None -+ -+ def get(self, key): - if key == "tokens/%s" % VALID_TOKEN: - dt = datetime.datetime.now() + datetime.timedelta(minutes=5) - return json.dumps(({'access': { -@@ -52,7 +55,7 @@ class FakeMemcache(object): - 'roles': [ - {'name': 'admin'}, - ]}, -- }}, timeutils.isotime(dt))) -+ }}, dt.strftime("%s"))) - if key == "tokens/%s" % VALID_TOKEN2: - dt = datetime.datetime.now() + datetime.timedelta(minutes=5) - return json.dumps(({'access': { -@@ -65,11 +68,11 @@ class FakeMemcache(object): - 'roles': [ - {'name': 'Member'}, - ]}, -- }}, timeutils.isotime(dt))) -+ }}, dt.strftime("%s"))) - -- @staticmethod -- def set(key, value, **kwargs): -- pass -+ def set(self, key, value, **kwargs): -+ self.set_value = value -+ self.set_key = key - - - class TestAPIACL(FunctionalTest, diff --git a/debian/patches/skip-database-tests.patch b/debian/patches/skip-database-tests.patch deleted file mode 100644 index db767b3..0000000 --- a/debian/patches/skip-database-tests.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py -index 807c666..1636b3d 100644 ---- a/ceilometer/tests/db.py -+++ b/ceilometer/tests/db.py -@@ -43,8 +43,8 @@ class TestBase(test_base.BaseTestCase): - message='.*you must provide a username and password.*') - try: - self.conn = storage.get_connection(self.CONF) -- except storage.StorageBadVersion as e: -- self.skipTest(str(e)) -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.conn.upgrade() - - self.CONF([], project='ceilometer') -@@ -68,9 +68,7 @@ class MongoDBFakeConnectionUrl(object): - def __init__(self): - self.url = os.environ.get('CEILOMETER_TEST_MONGODB_URL') - if not self.url: -- raise RuntimeError( -- "No MongoDB test URL set," -- "export CEILOMETER_TEST_MONGODB_URL environment variable") -+ return - - def __str__(self): - return '%(url)s_%(db)s' % dict(url=self.url, db=uuid.uuid4().hex) -@@ -81,6 +79,7 @@ class DB2FakeConnectionUrl(MongoDBFakeConnectionUrl): - self.url = (os.environ.get('CEILOMETER_TEST_DB2_URL') or - os.environ.get('CEILOMETER_TEST_MONGODB_URL')) - if not self.url: -+ return - raise RuntimeError( - "No DB2 test URL set, " - "export CEILOMETER_TEST_DB2_URL environment variable") -@@ -95,7 +94,4 @@ class MixinTestsWithBackendScenarios(object): - - scenarios = [ - ('sqlalchemy', dict(database_connection='sqlite://')), -- ('mongodb', dict(database_connection=MongoDBFakeConnectionUrl())), -- ('hbase', dict(database_connection='hbase://__test__')), -- ('db2', dict(database_connection=DB2FakeConnectionUrl())), - ] -diff --git a/ceilometer/tests/test_bin.py b/ceilometer/tests/test_bin.py -index 09a6ee6..be7b4b3 100644 ---- a/ceilometer/tests/test_bin.py -+++ b/ceilometer/tests/test_bin.py -@@ -44,13 +44,19 @@ class BinTestCase(base.BaseTestCase): - os.remove(self.tempfile) - - def test_dbsync_run(self): -- subp = subprocess.Popen(['ceilometer-dbsync', -- "--config-file=%s" % self.tempfile]) -+ try: -+ subp = subprocess.Popen(['ceilometer-dbsync', -+ "--config-file=%s" % self.tempfile]) -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.assertEqual(subp.wait(), 0) - - def test_run_expirer(self): -- subp = subprocess.Popen(['ceilometer-expirer', -- "--config-file=%s" % self.tempfile]) -+ try: -+ subp = subprocess.Popen(['ceilometer-expirer', -+ "--config-file=%s" % self.tempfile]) -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.assertEqual(subp.wait(), 0) - - -@@ -71,10 +77,13 @@ class BinSendCounterTestCase(base.BaseTestCase): - os.remove(self.tempfile) - - def test_send_counter_run(self): -- subp = subprocess.Popen([self.path_get('bin/ceilometer-send-counter'), -- "--config-file=%s" % self.tempfile, -- "--counter-resource=someuuid", -- "--counter-name=mycounter"]) -+ try: -+ subp = subprocess.Popen([self.path_get('bin/ceilometer-send-counter'), -+ "--config-file=%s" % self.tempfile, -+ "--counter-resource=someuuid", -+ "--counter-name=mycounter"]) -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.assertEqual(subp.wait(), 0) - - -@@ -102,8 +111,11 @@ class BinApiTestCase(base.BaseTestCase): - self.tempfile = fileutils.write_to_tempfile(content=content, - prefix='ceilometer', - suffix='.conf') -- self.subp = subprocess.Popen(['ceilometer-api', -- "--config-file=%s" % self.tempfile]) -+ try: -+ self.subp = subprocess.Popen(['ceilometer-api', -+ "--config-file=%s" % self.tempfile]) -+ except: -+ self.skipTest('Skipped By Ubuntu') - - def tearDown(self): - super(BinApiTestCase, self).tearDown() -diff --git a/ceilometer/tests/test_service.py b/ceilometer/tests/test_service.py -index 0334bd5..4edf996 100644 ---- a/ceilometer/tests/test_service.py -+++ b/ceilometer/tests/test_service.py -@@ -148,7 +148,10 @@ class ServiceRestartTest(base.BaseTestCase): - self.check_process_alive() - - def _service_restart(self, cmd): -- self._spawn_service(cmd) -+ try: -+ self._spawn_service(cmd) -+ except: -+ self.skipTest('Skipped by Ubuntu') - - self.assertTrue(self.sub.pid) - #NOTE(Fengqian): Modify the pipleline configure file to see diff --git a/rpm/SOURCES/0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch b/rpm/SOURCES/0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch new file mode 100644 index 0000000..59dc268 --- /dev/null +++ b/rpm/SOURCES/0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch @@ -0,0 +1,36 @@ +From 81d2cd61980f39ef952bc715d4dec4d3a1d7efd1 Mon Sep 17 00:00:00 2001 +From: Russell Bryant +Date: Mon, 9 Jun 2014 17:02:12 -0400 +Subject: [PATCH] Ensure routing key is specified in the address for a direct + producer + +This change is already merged in oslo-incubator. Note that for +Ceilometer this is an Icehouse-specific patch since master has already +been updated to use the oslo.messaging library. + +Original commit message body includes: + + Porting this fix from oslo.messaging. This fixes the impl_qpid.py + driver to allow it to work with the latest stable upstream QPID broker + (version 0.28). See the Apache Qpid Jira bug + https://issues.apache.org/jira/browse/QPID-5557 + +Change-Id: If71f78e50f8a9b3acfd1e9d02c8271f17c4ebee7 +Related-Bug: #1300318 +--- + ceilometer/openstack/common/rpc/impl_qpid.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ceilometer/openstack/common/rpc/impl_qpid.py b/ceilometer/openstack/common/rpc/impl_qpid.py +index 7ba2240..e878b90 100644 +--- a/ceilometer/openstack/common/rpc/impl_qpid.py ++++ b/ceilometer/openstack/common/rpc/impl_qpid.py +@@ -368,7 +368,7 @@ class DirectPublisher(Publisher): + """Init a 'direct' publisher.""" + + if conf.qpid_topology_version == 1: +- node_name = msg_id ++ node_name = "%s/%s" % (msg_id, msg_id) + node_opts = {"type": "direct"} + elif conf.qpid_topology_version == 2: + node_name = "amq.direct/%s" % msg_id diff --git a/rpm/SOURCES/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/rpm/SOURCES/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch deleted file mode 100644 index 4ebc58d..0000000 --- a/rpm/SOURCES/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ab03700f4e6cd70ff86921312414918b93f2ce32 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= -Date: Mon, 27 Jan 2014 12:24:35 +0000 -Subject: [PATCH] Ensure we don't access the net when building docs - -(Note, this has not been sent upstream) ---- - doc/source/conf.py | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/doc/source/conf.py b/doc/source/conf.py -index 02e97e1..4db8a9a 100644 ---- a/doc/source/conf.py -+++ b/doc/source/conf.py -@@ -142,7 +142,6 @@ write_autodoc_index() - # or your custom ones. - extensions = [ - 'sphinx.ext.autodoc', -- 'sphinx.ext.intersphinx', - 'sphinx.ext.todo', - 'sphinxcontrib.autohttp.flask', - 'wsmeext.sphinxext', diff --git a/rpm/SOURCES/ceilometer-dist.conf b/rpm/SOURCES/ceilometer-dist.conf index ff72b86..3a90f96 100644 --- a/rpm/SOURCES/ceilometer-dist.conf +++ b/rpm/SOURCES/ceilometer-dist.conf @@ -1,6 +1,6 @@ [DEFAULT] log_dir = /var/log/ceilometer -rpc_backend = ceilometer.openstack.common.rpc.impl_qpid +use_stderr = False [database] connection = mongodb://localhost:27017/ceilometer diff --git a/rpm/SPECS/openstack-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec index e4c7063..a29b995 100644 --- a/rpm/SPECS/openstack-ceilometer.spec +++ b/rpm/SPECS/openstack-ceilometer.spec @@ -3,14 +3,14 @@ %global pypi_name ceilometer Name: openstack-ceilometer -Version: 2014.1 -Release: 0.6.rc1%{?dist} +Version: 2014.1.1 +Release: 2%{?dist} Summary: OpenStack measurement collection service Group: Applications/System License: ASL 2.0 URL: https://wiki.openstack.org/wiki/Ceilometer -Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.rc1.tar.gz +Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.tar.gz Source1: %{pypi_name}-dist.conf Source2: %{pypi_name}.logrotate @@ -30,9 +30,9 @@ Source16: %{name}-notification.init Source160: %{name}-notification.upstart # -# patches_base=2014.1.rc1 +# patches_base=2014.1.1 # -Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch +Patch0001: 0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch # This is EL6 specific and not upstream Patch100: openstack-ceilometer-newdeps.patch @@ -63,7 +63,6 @@ Group: Applications/System Requires: python-qpid Requires: python-kombu -Requires: python-amqplib Requires: python-babel Requires: python-eventlet @@ -74,7 +73,7 @@ Requires: python-anyjson Requires: python-jsonpath-rw Requires: python-stevedore >= 0.14 Requires: python-msgpack -Requires: python-six >= 1.4.1 +Requires: python-six >= 1.6 Requires: PyYAML Requires: python-sqlalchemy0.7 @@ -88,7 +87,20 @@ Requires: python-oslo-config >= 1:1.2.0 Requires: pysnmp Requires: pytz Requires: python-croniter -Requires: python-pecan + +# These were only added as global dependencies +# at the end of the Icehouse cycle with the change +# to cli.py referenced from in http://pad.lv/1317210 +Requires: python-pymongo +Requires: python-flask +Requires: python-pecan >= 0.4.5 +Requires: python-wsme >= 0.6 +Requires: python-novaclient +Requires: python-keystoneclient +Requires: python-glanceclient +Requires: python-swiftclient +Requires: python-ceilometerclient +Requires: libvirt-python %description -n python-ceilometer OpenStack ceilometer provides services to measure and @@ -128,7 +140,6 @@ Requires: %{name}-common = %{version}-%{release} Requires: python-novaclient Requires: python-keystoneclient Requires: libvirt-python -Requires: python-pecan %description compute OpenStack ceilometer provides services to measure and @@ -157,18 +168,38 @@ This package contains the central ceilometer agent. %package collector -Summary: OpenStack ceilometer collector agent +Summary: OpenStack ceilometer collector Group: Applications/System Requires: %{name}-common = %{version}-%{release} +# For compat with older provisioning tools. +# Remove when all reference the notification package explicitly +Requires: %{name}-notification + Requires: python-pymongo %description collector OpenStack ceilometer provides services to measure and collect metrics from OpenStack components. -This package contains the ceilometer collector agent. +This package contains the ceilometer collector service +which collects metrics from the various agents. + + +%package notification +Summary: OpenStack ceilometer notification agent +Group: Applications/System + +Requires: %{name}-common = %{version}-%{release} + +%description notification +OpenStack ceilometer provides services to measure and +collect metrics from OpenStack components. + +This package contains the ceilometer notification agent +which pushes metrics to the collector service from the +various OpenStack services. %package api @@ -337,6 +368,12 @@ if [ $1 -eq 1 ] ; then /sbin/chkconfig --add %{name}-collector fi +%post notification +if [ $1 -eq 1 ] ; then + # Initial installation + /sbin/chkconfig --add %{name}-notification +fi + %post api if [ $1 -eq 1 ] ; then # Initial installation @@ -367,7 +404,15 @@ fi %preun collector if [ $1 -eq 0 ] ; then - for svc in collector notification; do + for svc in collector; do + /sbin/service %{name}-${svc} stop > /dev/null 2>&1 + /sbin/chkconfig --del %{name}-${svc} + done +fi + +%preun notification +if [ $1 -eq 0 ] ; then + for svc in notification; do /sbin/service %{name}-${svc} stop > /dev/null 2>&1 /sbin/chkconfig --del %{name}-${svc} done @@ -408,7 +453,15 @@ fi %postun collector if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall - for svc in collector notification; do + for svc in collector; do + /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || : + done +fi + +%postun notification +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + for svc in notification; do /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || : done fi @@ -481,10 +534,13 @@ fi %files collector %{_bindir}/ceilometer-collector* -%{_bindir}/ceilometer-agent-notification %{_initrddir}/%{name}-collector -%{_initrddir}/%{name}-notification %{_datarootdir}/ceilometer/%{name}-collector.upstart + + +%files notification +%{_bindir}/ceilometer-agent-notification +%{_initrddir}/%{name}-notification %{_datarootdir}/ceilometer/%{name}-notification.upstart @@ -511,6 +567,24 @@ fi %changelog +* Wed Jun 11 2014 Steve Linabery - 2014.1.1-2 +- Update to upstream 2014.1.1 +- fix message routing with newer QPID (rhbz#1103800) + +* Sat Jun 07 2014 Fedora Release Engineering - 2014.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 07 2014 Pádraig Brady - 2014.1-2 +- Avoid dependency issues with distributed installs (#1095414) + +* Thu Apr 17 2014 Pádraig Brady - 2014.1-1 +- Update to Icehouse release + +* Fri Apr 11 2014 Pádraig Brady - 2014.1-0.7.rc2 +- Update to upstream 2014.1.rc2 +- Remove qpid as default rpc backend +- Split out openstack-ceilometer-notification subpackage from collector + * Mon Mar 31 2014 Pádraig Brady 2014.1-0.6.rc1 - Update to upstream 2014.1.rc1