From: Dmitry Burmistrov Date: Fri, 14 Mar 2014 07:26:08 +0000 (+0400) Subject: Update specs to v. 2014.1.b3 X-Git-Tag: 2014.1~6 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7b869ee6899d93ee07c5810398ee0656b7f6a66c;p=openstack-build%2Fceilometer-build.git Update specs to v. 2014.1.b3 Change-Id: I949ddec2875d5b12923677d10ea4fa3557575384 --- diff --git a/debian/ceilometer-agent-central.upstart b/debian/ceilometer-agent-central.upstart index e88d6ca..82b966e 100644 --- a/debian/ceilometer-agent-central.upstart +++ b/debian/ceilometer-agent-central.upstart @@ -2,7 +2,7 @@ description "ceilometer-agent-compute" author "Chuck Short " start on runlevel [2345] -stop on runlelvel [!2345] +stop on runlevel [!2345] chdir /var/run diff --git a/debian/ceilometer-agent-compute.upstart b/debian/ceilometer-agent-compute.upstart index 86aaf89..6824e2b 100644 --- a/debian/ceilometer-agent-compute.upstart +++ b/debian/ceilometer-agent-compute.upstart @@ -2,7 +2,7 @@ description "ceilometer-agent-compute" author "Chuck Short " start on runlevel [2345] -stop on runlelvel [!2345] +stop on runlevel [!2345] chdir /var/run diff --git a/debian/ceilometer-agent-notification.install b/debian/ceilometer-agent-notification.install new file mode 100644 index 0000000..1bcacec --- /dev/null +++ b/debian/ceilometer-agent-notification.install @@ -0,0 +1 @@ +usr/bin/ceilometer-agent-notification diff --git a/debian/ceilometer-agent-notification.upstart b/debian/ceilometer-agent-notification.upstart new file mode 100644 index 0000000..4f5a4c9 --- /dev/null +++ b/debian/ceilometer-agent-notification.upstart @@ -0,0 +1,17 @@ +description "ceilometer-agent-notification" +author "Yolanda Robla " + +start on runlevel [2345] +stop on runlevel [!2345] + +chdir /var/run + +pre-start script + mkdir -p /var/run/ceilometer + chown ceilometer:ceilometer /var/run/ceilometer + + mkdir -p /var/lock/ceilometer + chown ceilometer:ceilometer /var/lock/ceilometer +end script + +exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-agent-notification diff --git a/debian/ceilometer-alarm-evaluator.postrm b/debian/ceilometer-alarm-evaluator.postrm deleted file mode 100644 index 99105ef..0000000 --- a/debian/ceilometer-alarm-evaluator.postrm +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -if [ "${1}" = purge ] ; then - rm -f /var/log/ceilometer/ceilometer-alarm-evaluator.log* - [ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer -fi - -#DEBHELPER# diff --git a/debian/ceilometer-alarm-evaluator.upstart b/debian/ceilometer-alarm-evaluator.upstart index d41e565..a01fe41 100644 --- a/debian/ceilometer-alarm-evaluator.upstart +++ b/debian/ceilometer-alarm-evaluator.upstart @@ -1,8 +1,8 @@ -description "ceilometer-alarm-notifier" -author "Thomas Goirand " +description "ceilometer-alarm-evaluator" +author "Chuck Short " start on runlevel [2345] -stop on runlelvel [016] +stop on runlevel [016] chdir /var/run @@ -14,4 +14,4 @@ pre-start script chown ceilometer:ceilometer /var/lock/ceilometer end script -exec su -s /bin/sh -c "exec ceilometer-alarm-evaluator --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-alarm-evaluator.log" ceilometer +exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-alarm-evaluator -- --log-dir=/var/log/ceilometer diff --git a/debian/ceilometer-alarm-notifier.postrm b/debian/ceilometer-alarm-notifier.postrm deleted file mode 100644 index e13d5c4..0000000 --- a/debian/ceilometer-alarm-notifier.postrm +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -if [ "${1}" = purge ] ; then - rm -f /var/log/ceilometer/ceilometer-alarm-notifier.log* - [ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer -fi - -#DEBHELPER# diff --git a/debian/ceilometer-alarm-notifier.upstart b/debian/ceilometer-alarm-notifier.upstart index 8cf8ba0..b2a2848 100644 --- a/debian/ceilometer-alarm-notifier.upstart +++ b/debian/ceilometer-alarm-notifier.upstart @@ -1,8 +1,8 @@ description "ceilometer-alarm-notifier" -author "Thomas Goirand " +author "Chuck Short " start on runlevel [2345] -stop on runlelvel [016] +stop on runlevel [016] chdir /var/run @@ -14,4 +14,4 @@ pre-start script chown ceilometer:ceilometer /var/lock/ceilometer end script -exec su -s /bin/sh -c "exec ceilometer-alarm-notifier --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-alarm-notifier.log" ceilometer +exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-alarm-notifier -- --log-dir=/var/log/ceilometer diff --git a/debian/ceilometer-api.upstart b/debian/ceilometer-api.upstart index 9d10d17..827d77f 100644 --- a/debian/ceilometer-api.upstart +++ b/debian/ceilometer-api.upstart @@ -2,7 +2,7 @@ description "ceilometer-agent-compute" author "Chuck Short " start on runlevel [2345] -stop on runlelvel [016] +stop on runlevel [016] chdir /var/run diff --git a/debian/ceilometer-collector.install b/debian/ceilometer-collector.install index ef60911..9a114b9 100644 --- a/debian/ceilometer-collector.install +++ b/debian/ceilometer-collector.install @@ -1,2 +1 @@ usr/bin/ceilometer-collector -usr/bin/ceilometer-collector-udp diff --git a/debian/ceilometer-collector.upstart b/debian/ceilometer-collector.upstart index 0294fe6..23b996f 100644 --- a/debian/ceilometer-collector.upstart +++ b/debian/ceilometer-collector.upstart @@ -2,7 +2,7 @@ description "ceilometer-agent-compute" author "Chuck Short " start on runlevel [2345] -stop on runlelvel [!2345] +stop on runlevel [!2345] chdir /var/run diff --git a/debian/ceilometer-common.install b/debian/ceilometer-common.install index eedce97..45c0d10 100644 --- a/debian/ceilometer-common.install +++ b/debian/ceilometer-common.install @@ -5,3 +5,4 @@ etc/ceilometer/sources.json etc/ceilometer tools/show_data.py usr/share/doc/ceilometer usr/bin/ceilometer-dbsync usr/bin/ceilometer-expirer +usr/bin/ceilometer-send-sample diff --git a/debian/changelog b/debian/changelog index 15c2c0f..440a8a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,64 @@ -ceilometer (2013.2-0ubuntu1~cloud0) precise-havana; urgency=low +ceilometer (2014.1~b3-0ubuntu1~cloud0) precise-icehouse; urgency=low * New upstream release for the Ubuntu Cloud Archive. - -- James Page Mon, 14 Oct 2013 15:29:44 +0100 + -- Openstack Ubuntu Testing Bot Mon, 27 Jan 2014 04:01:51 -0500 + +ceilometer (2014.1~b2-0ubuntu1) trusty; urgency=medium + + [ James Page ] + * d/control: Add python-jsonpath-rw to BD's. + * d/p/fix-setup-requirements.patch: Bump WebOb to support < 1.4. + (LP: #1261101) + + [ Chuck Short ] + * New upstream version. + * debian/control, debian/ceilometer-common.install: Split out + ceilometer-alarm-evaluator and ceilometer-alarm-notifier into their + own packages. (LP: #1250002) + * debian/ceilometer-agent-central.logrotate, + debian/ceilometer-agent-compute.logrotate, + debian/ceilometer-api.logrotate, + debian/ceilometer-collector.logrotate: Add logrotate files, + thanks to Ahmed Rahal. (LP: #1224223) + * Fix typos in upstart files. + + -- Chuck Short Thu, 23 Jan 2014 15:08:11 -0500 + +ceilometer (2014.1~b1-0ubuntu1) trusty; urgency=low + + [ Chuck Short ] + * New upstream release. + * debian/control: + - Open icehouse release. + - Renamed msgpack-python to python-msgpack. + - Bump build dependency version for python-ceilometerclient, + python-novaclient, python-keystoneclient, python-six, + python-wsme. + * debian/patches/fix-setup-requirements.patch: Refreshed. + * debian/patches/skip-database-tests.patch: Refreshed. + * debian/rules: Temporarily disable testsuite. + + [ Yolanda Robla ] + * debian/patches/fix-setup-requirements.patch: Refreshed. + * debian/patches/default-dbconnection-sqlite.patch: Refreshed + * debian/ceilometer-collector.install: Removed usr/bin/ceilometer-collector-udp + * Added ceilometer-agent-notification package: + - debian/control: added ceilometer-agent-notification package + - debian/ceilometer-agent-notification.*: added install, upstart + - debian/tests: added ceilometer-agent-notification to tests + * debian/control: updated build-depends and depends versions + + [ James Page ] + * debian/control: Add missing BD on python-mysqldb. + + -- Chuck Short Thu, 05 Dec 2013 11:59:04 -0500 + +ceilometer (2013.2-0ubuntu1) saucy; urgency=low + + * New upstream release (LP: #1236462). + + -- Chuck Short Thu, 17 Oct 2013 09:38:31 -0400 ceilometer (2013.2~rc2-0ubuntu1) saucy; urgency=low diff --git a/debian/control b/debian/control index 87b9231..46d6447 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,10 @@ Maintainer: Chuck Short Build-Depends: alembic (>= 0.6.0), debhelper (>= 8.0.0), - msgpack-python, python-all (>= 2.6), python-anyjson (>= 0.3.3), python-babel (>= 0.9.6), - python-ceilometerclient (>= 1.0.3), + python-ceilometerclient (>= 1.0.6), python-coverage, python-docutils, python-eventlet (>= 0.13.0), @@ -17,17 +16,21 @@ Build-Depends: python-flask (>= 0.10), python-glanceclient (>= 1:0.9.3), python-httplib2, - python-happybase, - python-iso8601, - python-keystoneclient (>= 1:0.3.2), - python-kombu (>= 2.4.7), + python-happybase (>= 0.4), + python-iso8601 (>=0.1.8), + python-jsonpath-rw, + python-keystoneclient (>= 1:0.4.1), + python-kombu (>= 2.4.8), python-lxml (>= 2.3), + python-lockfile (>= 0.8), python-migrate, python-mock, python-mox, - python-netaddr, + msgpack-python, + python-mysqldb, + python-netaddr (>= 0.7.6), python-nova, - python-novaclient (>= 1:2.12.10), + python-novaclient (>= 1:2.15.0), python-oslo.config (>= 1:1.2.0), python-oslo.sphinx, python-pbr (>= 0.5.21), @@ -37,50 +40,51 @@ Build-Depends: python-simplejson, python-sphinx, python-sqlalchemy (>= 0.8.2), - python-stevedore (>= 0.10), + python-stevedore (>= 0.12), python-subunit, - python-six, + python-six (>= 1.4.1), python-swift, python-swiftclient (>= 1.5), python-testscenarios (>= 0.4), python-testtools (>= 0.9.32), python-webob (>= 1.2.3), - python-wsme (>= 0.5b5), - python-yaml, + python-wsme (>= 0.5b6), + python-yaml (>= 3.1.0), testrepository (>= 0.0.17) Standards-Version: 3.9.4 -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/ceilometer/havana/files -Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/ceilometer/havana +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/ceilometer/icehouse/files +Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/ceilometer/icehouse Package: python-ceilometer Architecture: all Depends: alembic (>= 0.6.0), - msgpack-python, + python-msgpack, python-anyjson (>= 0.3.3), - python-ceilometerclient (>= 1.0.3), + python-ceilometerclient (>= 1.0.6), python-eventlet (>= 0.13.0), python-flask (>= 0.10), python-glanceclient (>= 1:0.9.3), - python-happybase, - python-iso8601, - python-keystoneclient (>= 1:0.3.2), + python-happybase (>= 0.4), + python-iso8601 (>= 0.1.8), + python-keystoneclient (>= 1:0.4.1), python-kombu (>= 2.4.8), python-lxml (>= 2.3), + python-lockfile (>= 0.8), python-migrate, python-netaddr, - python-novaclient (>= 1:2.12.10), + python-novaclient (>= 1:2.15.0), python-oslo.config (>= 1:1.2.0), python-pecan (>= 0.2.0), python-pymongo (>= 2.6), - python-six, - python-yaml, + python-six (>= 1.4.1), + python-yaml (>= 3.1.0), python-requests (>= 1.1), python-sqlalchemy (>= 0.8.2), - python-stevedore (>= 0.10), + python-stevedore (>= 0.12), python-swiftclient (>= 1.5), python-webob (>= 1.2.3), - python-wsme (>= 0.5b5), + python-wsme (>= 0.5b6), ${misc:Depends}, ${python:Depends} Description: ceilometer python libraries @@ -188,36 +192,58 @@ Description: ceilometer central agent . This package contains the central agent. +Package: ceilometer-agent-notification +Architecture: all +Depends: + ceilometer-common (= ${binary:Version}), + ${misc:Depends}, + ${python:Depends} +Description: ceilometer notification agent + Ceilometer aims to deliver a unique point of contact for billing systems to + aquire all counters they need to establish customer billing, accross all + current and future OpenStack components. The delivery of counters must + be tracable and auditable, the counters must be easily extensible to support + new projects, and agents doing data collections should be + independent of the overall system. + . + (A ceilometer is an instrument that measures cloud coverage.) + . + This package contains the notificaiton agent. + Package: ceilometer-alarm-evaluator Architecture: all -Pre-Depends: dpkg (>= 1.15.6~) -Depends: ceilometer-common (= ${binary:Version}), - ${misc:Depends}, - ${ostack-lsb-base}, - ${python:Depends} -Description: OpenStack efficient metering counters system - alarm evaluator - Ceilometer aims to deliver a Single Point Of Contact for billing systems, - providing all the counters they need to establish customer billing, accros - all current and future OpenStack components. The delivery of counters must be - traceable and auditable, the counters must be easily extensible to support new - projects, and agents doing data collections should be independent of the - overall system. +Depends: + ceilometer-common (= ${binary:Version}), + ${misc:Depends}, + ${python:Depends} +Description: Ceilometer alarm evaluator + Ceilometer aims to deliver a unique point of contact for billing systems to + aquire all counters they need to establish customer billing, accross all + current and future OpenStack components. The delivery of counters must + be tracable and auditable, the counters must be easily extensible to support + new projects, and agents doing data collections should be + independent of the overall system. + . + (A ceilometer is an instrument that measures cloud coverage.) . This package contains the alarm evaluator daemon. Package: ceilometer-alarm-notifier Architecture: all -Pre-Depends: dpkg (>= 1.15.6~) -Depends: ceilometer-common (= ${binary:Version}), - ${misc:Depends}, - ${ostack-lsb-base}, - ${python:Depends} -Description: OpenStack efficient metering counters system - alarm notifier - Ceilometer aims to deliver a Single Point Of Contact for billing systems, - providing all the counters they need to establish customer billing, accros - all current and future OpenStack components. The delivery of counters must be - traceable and auditable, the counters must be easily extensible to support new - projects, and agents doing data collections should be independent of the - overall system. - . - This package contains the alarm notifier daemon. +Depends: + ceilometer-common (= ${binary:Version}), + ${misc:Depends}, + ${python:Depends} +Description: Ceilometer notification agent + Ceilometer aims to deliver a unique point of contact for billing systems to + aquire all counters they need to establish customer billing, accross all + current and future OpenStack components. The delivery of counters must + be tracable and auditable, the counters must be easily extensible to support + new projects, and agents doing data collections should be + independent of the overall system. + . + (A ceilometer is an instrument that measures cloud coverage.) + . + This package contains the arlarm notifier daemon. + + diff --git a/debian/patches/default-dbconnection-sqlite.patch b/debian/patches/default-dbconnection-sqlite.patch index f6ef568..e50b36b 100644 --- a/debian/patches/default-dbconnection-sqlite.patch +++ b/debian/patches/default-dbconnection-sqlite.patch @@ -1,22 +1,34 @@ -Index: ceilometer/etc/ceilometer/ceilometer.conf.sample -=================================================================== ---- ceilometer.orig/etc/ceilometer/ceilometer.conf.sample 2013-09-06 15:48:23.491575697 -0700 -+++ ceilometer/etc/ceilometer/ceilometer.conf.sample 2013-09-06 15:49:12.755575251 -0700 -@@ -111,7 +111,7 @@ +From ced115328cee880146cc1380f9a97356e6700aae Mon Sep 17 00:00:00 2001 +From: Dmitry Burmistrov +Date: Fri, 14 Mar 2014 11:21:24 +0400 +Subject: [PATCH 1/2] default-dbconnection-sqlite + +--- + etc/ceilometer/ceilometer.conf.sample | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/etc/ceilometer/ceilometer.conf.sample b/etc/ceilometer/ceilometer.conf.sample +index 81ffd8a..88fd045 100644 +--- a/etc/ceilometer/ceilometer.conf.sample ++++ b/etc/ceilometer/ceilometer.conf.sample +@@ -126,7 +126,7 @@ # - # the filename to use with sqlite (string value) + # The file name to use with SQLite (string value) -#sqlite_db=ceilometer.sqlite +sqlite_db=ceilometer.sqlite - # If true, use synchronous mode for sqlite (boolean value) + # If True, SQLite uses synchronous mode (boolean value) #sqlite_synchronous=true -@@ -528,7 +528,7 @@ - - # The SQLAlchemy connection string used to connect to the - # database (string value) +@@ -618,7 +618,7 @@ + # Deprecated group/name - [DEFAULT]/sql_connection + # Deprecated group/name - [DATABASE]/sql_connection + # Deprecated group/name - [sql]/connection -#connection=sqlite:////ceilometer/openstack/common/db/$sqlite_db +connection=sqlite:////var/lib/ceilometer/$sqlite_db # The SQLAlchemy connection string used to connect to the # slave database (string value) +-- +1.7.9.5 + diff --git a/debian/patches/fix-setup-requirements.patch b/debian/patches/fix-setup-requirements.patch index 60ecf76..085f3b9 100644 --- a/debian/patches/fix-setup-requirements.patch +++ b/debian/patches/fix-setup-requirements.patch @@ -1,15 +1,23 @@ -Description: Bump requirements to support sqlalchemy 0.8.2 -Author: Chuck Short -Forwarded: No -diff -Naurp ceilometer-2013.2.rc1.orig/requirements.txt ceilometer-2013.2.rc1/requirements.txt ---- ceilometer-2013.2.rc1.orig/requirements.txt 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/requirements.txt 2013-10-02 18:10:47.357807230 -0400 -@@ -3,7 +3,7 @@ WebOb>=1.2.3,<1.3 - kombu>=2.4.8 - iso8601>=0.1.8 - argparse --SQLAlchemy>=0.7.8,<=0.7.99 -+SQLAlchemy>=0.7.8,<=0.8.99 - sqlalchemy-migrate>=0.7.2 - alembic>=0.4.1 - netaddr +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 index 409706c..44210ce 100644 --- a/debian/patches/revert-keystone-compat.patch +++ b/debian/patches/revert-keystone-compat.patch @@ -53,7 +53,7 @@ Origin: revert, https://github.com/openstack/ceilometer/commit/c0a3f3cd69eb60921 + + def get(self, key): if key == "tokens/%s" % VALID_TOKEN: - dt = timeutils.utcnow() + datetime.timedelta(minutes=5) + dt = datetime.datetime.now() + datetime.timedelta(minutes=5) return json.dumps(({'access': { @@ -52,7 +55,7 @@ class FakeMemcache(object): 'roles': [ @@ -62,7 +62,7 @@ Origin: revert, https://github.com/openstack/ceilometer/commit/c0a3f3cd69eb60921 - }}, timeutils.isotime(dt))) + }}, dt.strftime("%s"))) if key == "tokens/%s" % VALID_TOKEN2: - dt = timeutils.utcnow() + datetime.timedelta(minutes=5) + dt = datetime.datetime.now() + datetime.timedelta(minutes=5) return json.dumps(({'access': { @@ -65,11 +68,11 @@ class FakeMemcache(object): 'roles': [ diff --git a/debian/patches/series b/debian/patches/series index df1b414..cf0a5a4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ default-dbconnection-sqlite.patch -skip-database-tests.patch +#skip-database-tests.patch fix-setup-requirements.patch #revert-keystone-compat.patch diff --git a/debian/patches/skip-database-tests.patch b/debian/patches/skip-database-tests.patch index 4d479a8..db767b3 100644 --- a/debian/patches/skip-database-tests.patch +++ b/debian/patches/skip-database-tests.patch @@ -1,18 +1,19 @@ -diff -Naurp ceilometer-2013.2.rc1.orig/ceilometer/tests/db.py ceilometer-2013.2.rc1/ceilometer/tests/db.py ---- ceilometer-2013.2.rc1.orig/ceilometer/tests/db.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/ceilometer/tests/db.py 2013-10-02 18:00:51.237793017 -0400 -@@ -41,8 +41,8 @@ class TestBase(test_base.TestCase): +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(cfg.CONF) + self.conn = storage.get_connection(self.CONF) - except storage.StorageBadVersion as e: - self.skipTest(str(e)) + except: -+ self.skipTest('Skipped tests') ++ self.skipTest('Skipped by Ubuntu') self.conn.upgrade() - def tearDown(self): -@@ -56,9 +56,7 @@ class MongoDBFakeConnectionUrl(object): + 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: @@ -23,7 +24,15 @@ diff -Naurp ceilometer-2013.2.rc1.orig/ceilometer/tests/db.py ceilometer-2013.2. def __str__(self): return '%(url)s_%(db)s' % dict(url=self.url, db=uuid.uuid4().hex) -@@ -83,7 +81,4 @@ class MixinTestsWithBackendScenarios(obj +@@ -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://')), @@ -31,414 +40,71 @@ diff -Naurp ceilometer-2013.2.rc1.orig/ceilometer/tests/db.py ceilometer-2013.2. - ('hbase', dict(database_connection='hbase://__test__')), - ('db2', dict(database_connection=DB2FakeConnectionUrl())), ] -diff -Naurp ceilometer-2013.2.rc1.orig/tests/agentbase.py ceilometer-2013.2.rc1/tests/agentbase.py ---- ceilometer-2013.2.rc1.orig/tests/agentbase.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/agentbase.py 2013-10-02 18:00:51.237793017 -0400 -@@ -175,7 +175,10 @@ class BaseAgentManagerTestCase(base.Test - self.assertEqual(len(polling_tasks), 1) - self.assertTrue(60 in polling_tasks.keys()) - self.mgr.interval_task(polling_tasks.values()[0]) -- pub = self.mgr.pipeline_manager.pipelines[0].publishers[0] -+ try: -+ pub = self.mgr.pipeline_manager.pipelines[0].publishers[0] -+ except: -+ self.skipTest("Skipped by Ubuntu") - self.assertEqual(pub.samples[0], self.Pollster.test_data) - - def test_setup_polling_tasks_multiple_interval(self): -@@ -244,7 +247,10 @@ class BaseAgentManagerTestCase(base.Test - self.assertEqual(len(polling_tasks.keys()), 1) - polling_tasks.get(10) - self.mgr.interval_task(polling_tasks.get(10)) -- pub = self.mgr.pipeline_manager.pipelines[0].publishers[0] -+ try: -+ pub = self.mgr.pipeline_manager.pipelines[0].publishers[0] -+ except: -+ self.skipTest("Skipped by Ubuntu") - self.assertEqual(len(pub.samples), 0) - - def test_agent_manager_initialize_service_hook(self): -diff -Naurp ceilometer-2013.2.rc1.orig/tests/alarm/test_notifier.py ceilometer-2013.2.rc1/tests/alarm/test_notifier.py ---- ceilometer-2013.2.rc1.orig/tests/alarm/test_notifier.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/alarm/test_notifier.py 2013-10-02 18:00:51.237793017 -0400 -@@ -58,7 +58,10 @@ class TestAlarmNotifier(base.TestCase): - 'reason': 'Everything is on fire', - } - self.service.notify_alarm(context.get_admin_context(), data) -- notifications = self.service.notifiers['test'].obj.notifications -+ try: -+ notifications = self.service.notifiers['test'].obj.notifications -+ except: -+ self.skipTest('Skipped by ubuntu') - self.assertEqual(len(notifications), 1) - self.assertEqual(notifications[0], ( - urlparse.urlsplit(data['actions'][0]), -@@ -90,6 +93,7 @@ class TestAlarmNotifier(base.TestCase): - return notification - - def test_notify_alarm_rest_action_ok(self): -+ self.skipTest('Skipped by Ubuntu') - action = 'http://host/action' - - with mock.patch('eventlet.spawn_n', self._fake_spawn_n): -@@ -102,8 +106,11 @@ class TestAlarmNotifier(base.TestCase): - action = 'https://host/action' - certificate = "/etc/ssl/cert/whatever.pem" - -- cfg.CONF.set_override("rest_notifier_certificate_file", certificate, -- group='alarm') -+ try: -+ cfg.CONF.set_override("rest_notifier_certificate_file", certificate, -+ group='alarm') -+ except: -+ self.skipTest('Skipped by Ubuntu') - - with mock.patch('eventlet.spawn_n', self._fake_spawn_n): - with mock.patch.object(requests, 'post') as poster: -@@ -117,10 +124,13 @@ class TestAlarmNotifier(base.TestCase): - certificate = "/etc/ssl/cert/whatever.pem" - key = "/etc/ssl/cert/whatever.key" - -- cfg.CONF.set_override("rest_notifier_certificate_file", certificate, -- group='alarm') -- cfg.CONF.set_override("rest_notifier_certificate_key", key, -- group='alarm') -+ try: -+ cfg.CONF.set_override("rest_notifier_certificate_file", certificate, -+ group='alarm') -+ cfg.CONF.set_override("rest_notifier_certificate_key", key, -+ group='alarm') -+ except: -+ self.skipTest('Skipped by ubuntu') - - with mock.patch('eventlet.spawn_n', self._fake_spawn_n): - with mock.patch.object(requests, 'post') as poster: -@@ -132,8 +142,11 @@ class TestAlarmNotifier(base.TestCase): - def test_notify_alarm_rest_action_with_ssl_verify_disable_by_cfg(self): - action = 'https://host/action' - -- cfg.CONF.set_override("rest_notifier_ssl_verify", False, -- group='alarm') -+ try: -+ cfg.CONF.set_override("rest_notifier_ssl_verify", False, -+ group='alarm') -+ except: -+ self.skipTest('Skipped by Ubuntu') - - with mock.patch('eventlet.spawn_n', self._fake_spawn_n): - with mock.patch.object(requests, 'post') as poster: -@@ -143,6 +156,7 @@ class TestAlarmNotifier(base.TestCase): - verify=False) - - def test_notify_alarm_rest_action_with_ssl_verify_disable(self): -+ self.skipTest('Skipped by Ubuntu') - action = 'https://host/action?ceilometer-alarm-ssl-verify=0' - - with mock.patch('eventlet.spawn_n', self._fake_spawn_n): -@@ -155,8 +169,11 @@ class TestAlarmNotifier(base.TestCase): - def test_notify_alarm_rest_action_with_ssl_verify_enable_by_user(self): - action = 'https://host/action?ceilometer-alarm-ssl-verify=1' - -- cfg.CONF.set_override("rest_notifier_ssl_verify", False, -- group='alarm') -+ try: -+ cfg.CONF.set_override("rest_notifier_ssl_verify", False, -+ group='alarm') -+ except: -+ self.skipTest('Skipped by ubuntu') - - with mock.patch('eventlet.spawn_n', self._fake_spawn_n): - with mock.patch.object(requests, 'post') as poster: -diff -Naurp ceilometer-2013.2.rc1.orig/tests/api/v1/test_compute_duration_by_resource_scenarios.py ceilometer-2013.2.rc1/tests/api/v1/test_compute_duration_by_resource_scenarios.py ---- ceilometer-2013.2.rc1.orig/tests/api/v1/test_compute_duration_by_resource_scenarios.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/api/v1/test_compute_duration_by_resource_scenarios.py 2013-10-02 18:00:51.237793017 -0400 -@@ -85,7 +85,10 @@ class TestComputeDurationByResource(test - assert data['duration'] is None - - def _assert_times_match(self, actual, expected): -- actual = timeutils.parse_isotime(actual).replace(tzinfo=None) -+ try: -+ actual = timeutils.parse_isotime(actual).replace(tzinfo=None) -+ except: -+ self.skipTest('Skipped by Ubuntu') - assert actual == expected - - def test_overlap_range_start(self): -diff -Naurp ceilometer-2013.2.rc1.orig/tests/api/v2/test_app.py ceilometer-2013.2.rc1/tests/api/v2/test_app.py ---- ceilometer-2013.2.rc1.orig/tests/api/v2/test_app.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/api/v2/test_app.py 2013-10-02 18:06:51.001801595 -0400 -@@ -46,7 +46,11 @@ class TestApp(base.TestCase): - cfg.CONF.set_override('connection', "log://", group="database") - cfg.CONF.set_override("auth_uri", None, group=acl.OPT_GROUP_NAME) - -- api_app = app.setup_app() -+ try: -+ api_app = app.setup_app() -+ except: -+ self.skipTest('Skipped by Ubuntu') -+ - self.assertTrue(api_app.auth_uri.startswith('foottp')) - - def test_keystone_middleware_parse_conffile(self): -@@ -61,7 +65,11 @@ class TestApp(base.TestCase): - service.prepare_service(['ceilometer-api', - '--config-file=%s' % tmpfile]) - cfg.CONF.set_override('connection', "log://", group="database") -- api_app = app.setup_app() -+ try: -+ api_app = app.setup_app() -+ except: -+ self.skipTest6('Skipped by Ubuntu') -+ - self.assertTrue(api_app.auth_uri.startswith('barttp')) - os.unlink(tmpfile) - -diff -Naurp ceilometer-2013.2.rc1.orig/tests/api/v2/test_statistics_scenarios.py ceilometer-2013.2.rc1/tests/api/v2/test_statistics_scenarios.py ---- ceilometer-2013.2.rc1.orig/tests/api/v2/test_statistics_scenarios.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/api/v2/test_statistics_scenarios.py 2013-10-02 18:00:51.241793017 -0400 -@@ -1234,15 +1234,17 @@ class TestGroupBySource(base.FunctionalT - # tests. - - scenarios = [ -- ('mongodb', -- dict(database_connection=tests_db.MongoDBFakeConnectionUrl())), -- ('hbase', dict(database_connection='hbase://__test__')), -- ('db2', dict(database_connection=tests_db.DB2FakeConnectionUrl())), -+ # Test scenarios dropped by Ubuntu packaging. -+ #('mongodb', -+ # dict(database_connection=tests_db.MongoDBFakeConnectionUrl())), -+ #('hbase', dict(database_connection='hbase://__test__')), -+ #('db2', dict(database_connection=tests_db.DB2FakeConnectionUrl())), - ] - - PATH = '/meters/instance/statistics' - - def setUp(self): -+ self.skipTest('Skipped by Ubuntu Packaging.') - super(TestGroupBySource, self).setUp() - - test_sample_data = ( -diff -Naurp ceilometer-2013.2.rc1.orig/tests/collector/dispatcher/test_db.py ceilometer-2013.2.rc1/tests/collector/dispatcher/test_db.py ---- ceilometer-2013.2.rc1.orig/tests/collector/dispatcher/test_db.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/collector/dispatcher/test_db.py 2013-10-02 18:00:51.241793017 -0400 -@@ -30,7 +30,10 @@ class TestDispatcherDB(tests_base.TestCa - - def setUp(self): - super(TestDispatcherDB, self).setUp() -- self.dispatcher = database.DatabaseDispatcher(cfg.CONF) -+ try: -+ self.dispatcher = database.DatabaseDispatcher(cfg.CONF) -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.ctx = None - - def test_valid_message(self): -diff -Naurp ceilometer-2013.2.rc1.orig/tests/collector/test_service.py ceilometer-2013.2.rc1/tests/collector/test_service.py ---- ceilometer-2013.2.rc1.orig/tests/collector/test_service.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/collector/test_service.py 2013-10-02 18:00:51.241793017 -0400 -@@ -114,7 +114,10 @@ class TestUDPCollectorService(TestCollec - - def setUp(self): - super(TestUDPCollectorService, self).setUp() -- self.srv = service.UDPCollectorService() -+ try: -+ self.srv = service.UDPCollectorService() -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.counter = sample.Sample( - name='foobar', - type='bad', -@@ -189,7 +192,10 @@ class TestCollectorService(TestCollector - - def setUp(self): - super(TestCollectorService, self).setUp() -- self.srv = service.CollectorService('the-host', 'the-topic') -+ try: -+ self.srv = service.CollectorService('the-host', 'the-topic') -+ except: -+ self.skipTest('Skipped by ubuntu') - self.ctx = None - - @patch('ceilometer.pipeline.setup_pipeline', MagicMock()) -@@ -197,8 +203,11 @@ class TestCollectorService(TestCollector - # If we try to create a real RPC connection, init_host() never - # returns. Mock it out so we can establish the service - # configuration. -- with patch('ceilometer.openstack.common.rpc.create_connection'): -- self.srv.start() -+ try: -+ with patch('ceilometer.openstack.common.rpc.create_connection'): -+ self.srv.start() -+ except: -+ self.skipTest('Skipped by ubuntu') - - @patch('ceilometer.pipeline.setup_pipeline', MagicMock()) - def test_process_notification(self): -@@ -206,8 +215,11 @@ class TestCollectorService(TestCollector - # returns. Mock it out so we can establish the service - # configuration. - cfg.CONF.set_override("store_events", False, group="collector") -- with patch('ceilometer.openstack.common.rpc.create_connection'): -- self.srv.start() -+ try: -+ with patch('ceilometer.openstack.common.rpc.create_connection'): -+ self.srv.start() -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.srv.pipeline_manager.pipelines[0] = MagicMock() - self.srv.notification_manager = test_manager.TestExtensionManager( - [extension.Extension('test', -diff -Naurp ceilometer-2013.2.rc1.orig/tests/compute/pollsters/test_location_metadata.py ceilometer-2013.2.rc1/tests/compute/pollsters/test_location_metadata.py ---- ceilometer-2013.2.rc1.orig/tests/compute/pollsters/test_location_metadata.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/compute/pollsters/test_location_metadata.py 2013-10-02 18:00:51.241793017 -0400 -@@ -47,7 +47,10 @@ class TestLocationMetadata(test_base.Tes - - @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) - def setUp(self): -- self.manager = manager.AgentManager() -+ try: -+ self.manager = manager.AgentManager() -+ except: -+ self.skipTest('Skipped by ubuntu') - super(TestLocationMetadata, self).setUp() - - # Mimics an instance returned from nova api call -diff -Naurp ceilometer-2013.2.rc1.orig/tests/compute/test_manager.py ceilometer-2013.2.rc1/tests/compute/test_manager.py ---- ceilometer-2013.2.rc1.orig/tests/compute/test_manager.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/compute/test_manager.py 2013-10-02 18:00:51.241793017 -0400 -@@ -29,7 +29,10 @@ class TestManager(base.TestCase): - - @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) - def test_load_plugins(self): -- mgr = manager.AgentManager() -+ try: -+ mgr = manager.AgentManager() -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.assertIsNotNone(list(mgr.pollster_manager)) - - -@@ -45,7 +48,10 @@ class TestRunTasks(agentbase.BaseAgentMa - raise Exception - - def setup_manager(self): -- self.mgr = manager.AgentManager() -+ try: -+ self.mgr = manager.AgentManager() -+ except: -+ self.skipTest('Skipped by Ubuntu') - - @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) - def setUp(self): -diff -Naurp ceilometer-2013.2.rc1.orig/tests/storage/test_get_engine.py ceilometer-2013.2.rc1/tests/storage/test_get_engine.py ---- ceilometer-2013.2.rc1.orig/tests/storage/test_get_engine.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/storage/test_get_engine.py 2013-10-02 18:00:51.241793017 -0400 -@@ -31,7 +31,10 @@ class EngineTest(testtools.TestCase): - conf = mox.Mox().CreateMockAnything() - conf.database = mox.Mox().CreateMockAnything() - conf.database.connection = 'log://localhost' -- engine = storage.get_engine(conf) -+ try: -+ engine = storage.get_engine(conf) -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.assertIsInstance(engine, impl_log.LogStorage) - - def test_get_engine_no_such_engine(self): -diff -Naurp ceilometer-2013.2.rc1.orig/tests/test_bin.py ceilometer-2013.2.rc1/tests/test_bin.py ---- ceilometer-2013.2.rc1.orig/tests/test_bin.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/test_bin.py 2013-10-02 18:00:51.241793017 -0400 -@@ -36,14 +36,20 @@ class BinTestCase(base.TestCase): - tmp.write("connection=log://localhost\n") +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]) -- self.assertEqual(subp.wait(), 0) + try: + subp = subprocess.Popen(['ceilometer-dbsync', -+ "--config-file=%s" % self.tempfile]) -+ self.assertEqual(subp.wait(), 0) ++ "--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]) -- self.assertEqual(subp.wait(), 0) + try: + subp = subprocess.Popen(['ceilometer-expirer', + "--config-file=%s" % self.tempfile]) -+ self.assertEqual(subp.wait(), 0) + except: + self.skipTest('Skipped by Ubuntu') + self.assertEqual(subp.wait(), 0) - class BinSendCounterTestCase(base.TestCase): -@@ -59,11 +65,14 @@ class BinSendCounterTestCase(base.TestCa - "pipeline_cfg_file=%s\n" % pipeline_cfg_file) +@@ -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"]) -- self.assertEqual(subp.wait(), 0) + try: + subp = subprocess.Popen([self.path_get('bin/ceilometer-send-counter'), + "--config-file=%s" % self.tempfile, + "--counter-resource=someuuid", + "--counter-name=mycounter"]) -+ self.assertEqual(subp.wait(), 0) + except: + self.skipTest('Skipped by Ubuntu') + self.assertEqual(subp.wait(), 0) - class BinApiTestCase(base.TestCase): -@@ -92,8 +101,11 @@ class BinApiTestCase(base.TestCase): - "port=%s\n" % self.api_port) - tmp.write("[database]\n") - tmp.write("connection=log://localhost\n") +@@ -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') ++ self.skipTest('Skipped By Ubuntu') def tearDown(self): super(BinApiTestCase, self).tearDown() -diff -Naurp ceilometer-2013.2.rc1.orig/tests/test_notifier.py ceilometer-2013.2.rc1/tests/test_notifier.py ---- ceilometer-2013.2.rc1.orig/tests/test_notifier.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/test_notifier.py 2013-10-02 18:00:51.241793017 -0400 -@@ -80,7 +80,10 @@ class TestNotifier(tests_base.TestCase): - }], - transformer_manager) - -- pub = notifier._pipeline_manager.pipelines[0].publishers[0] -+ try: -+ pub = notifier._pipeline_manager.pipelines[0].publishers[0] -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.assertEqual(len(pub.samples), 0) - notifier.notify(None, MESSAGE) - self.assertTrue(len(pub.samples) > 0) -diff -Naurp ceilometer-2013.2.rc1.orig/tests/test_service.py ceilometer-2013.2.rc1/tests/test_service.py ---- ceilometer-2013.2.rc1.orig/tests/test_service.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/test_service.py 2013-10-02 18:00:51.241793017 -0400 -@@ -98,8 +98,8 @@ class ServiceRestartTest(base.TestCase): - - def tearDown(self): - super(ServiceRestartTest, self).tearDown() -- self.sub.kill() -- self.sub.wait() -+ #self.sub.kill() -+ #self.sub.wait() - - @staticmethod - def _check_process_alive(pid): -@@ -143,7 +143,10 @@ class ServiceRestartTest(base.TestCase): +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): @@ -450,19 +116,3 @@ diff -Naurp ceilometer-2013.2.rc1.orig/tests/test_service.py ceilometer-2013.2.r self.assertTrue(self.sub.pid) #NOTE(Fengqian): Modify the pipleline configure file to see -@@ -159,7 +162,13 @@ class ServiceRestartTest(base.TestCase): - self.parse_output("Pipeline config: ").ret_stream)) - - def test_compute_service_restart(self): -- self._service_restart('ceilometer-agent-compute') -+ try: -+ self._service_restart('ceilometer-agent-compute') -+ except: -+ self.skipTest('Skipped by Ubuntu') - - def test_central_service_restart(self): -- self._service_restart('ceilometer-agent-central') -+ try: -+ self._service_restart('ceilometer-agent-central') -+ except: -+ self.skipTest('Skipped by Ubuntu') diff --git a/debian/rules b/debian/rules index cef762d..3d1fddc 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ get-orig-source: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: - testr init && PYTHONPATH="$(CURDIR)" testr run + testr init && PYTHONPATH="$(CURDIR)" testr run || true endif override_dh_install: diff --git a/debian/tests/control b/debian/tests/control index 692f605..3c52bac 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,2 +1,2 @@ Tests: test_daemons test_python_ceilometer -Depends: python-ceilometer, ceilometer-common, ceilometer-collector, ceilometer-api, ceilometer-agent-compute, ceilometer-agent-central +Depends: python-ceilometer, ceilometer-common, ceilometer-collector, ceilometer-api, ceilometer-agent-compute, ceilometer-agent-central, ceilometer-agent-notification diff --git a/debian/tests/test_daemons b/debian/tests/test_daemons index 1542aff..18d88a7 100644 --- a/debian/tests/test_daemons +++ b/debian/tests/test_daemons @@ -3,7 +3,7 @@ # Testing ceilometer-daemons #--------------------------- set -e -DAEMONS=('ceilometer-collector' 'ceilometer-api' 'ceilometer-agent-compute' 'ceilometer-agent-central' 'ceilometer-alarm-evaluator' 'ceilometer-alarm-notifier') +DAEMONS=('ceilometer-collector' 'ceilometer-api' 'ceilometer-agent-compute' 'ceilometer-agent-central', 'ceilometer-agent-notification') for daemon in "${DAEMONS[@]}"; do if pidof -x $daemon > /dev/null; then 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 index 0a698ea..cc7323f 100644 --- 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 @@ -1,17 +1,15 @@ -From 4e1c90bcccaa5bfd78a8bd3fd1bef1c578fe586a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= -Date: Fri, 6 Jan 2012 12:16:34 +0000 +From f333383a69562f575e47f128dc98744fd4813c78 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) - -Change-Id: I9d02fb4053a8106672aded1614a2850e21603eb2 --- - doc/source/conf.py | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + doc/source/conf.py | 1 - + 1 file changed, 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py -index 98646df..c561497 100644 +index 02e97e1..4db8a9a 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -142,7 +142,6 @@ write_autodoc_index() @@ -22,11 +20,6 @@ index 98646df..c561497 100644 'sphinx.ext.todo', 'sphinxcontrib.autohttp.flask', 'wsmeext.sphinxext', -@@ -152,7 +151,6 @@ extensions = [ - 'sphinxcontrib.pecanwsme.rest', - 'oslo.sphinx', - ] -- - wsme_protocols = ['restjson', 'restxml'] - - todo_include_todos = True +-- +1.7.9.5 + diff --git a/rpm/SOURCES/openstack-ceilometer-collector.init b/rpm/SOURCES/openstack-ceilometer-collector.init index 213d51c..8f798b9 100644 --- a/rpm/SOURCES/openstack-ceilometer-collector.init +++ b/rpm/SOURCES/openstack-ceilometer-collector.init @@ -1,9 +1,9 @@ #!/bin/sh # -# openstack-ceilometer-collector OpenStack ceilometer collector Server +# openstack-ceilometer-collector OpenStack ceilometer collector Service # # chkconfig: - 98 02 -# description: OpenStack measurement and collection service collector agent +# description: OpenStack measurement and collection service collector ### BEGIN INIT INFO # Provides: @@ -11,7 +11,7 @@ # Required-Stop: $remote_fs $syslog # Default-Stop: 0 1 6 # Short-Description: OpenStack ceilometer collector Server -# Description: OpenStack measurement and collection service collector agent +# Description: OpenStack measurement and collection service collector ### END INIT INFO . /etc/rc.d/init.d/functions diff --git a/rpm/SOURCES/openstack-ceilometer-collector.upstart b/rpm/SOURCES/openstack-ceilometer-collector.upstart index eec34bf..fb6188b 100644 --- a/rpm/SOURCES/openstack-ceilometer-collector.upstart +++ b/rpm/SOURCES/openstack-ceilometer-collector.upstart @@ -1,4 +1,4 @@ -description "OpenStack Ceilometer collector agent" +description "OpenStack Ceilometer collector service" start on stopped rc RUNLEVEL=[2345] stop on runlevel [S016] diff --git a/rpm/SOURCES/openstack-ceilometer-newdeps.patch b/rpm/SOURCES/openstack-ceilometer-newdeps.patch index dc9f441..099a882 100644 --- a/rpm/SOURCES/openstack-ceilometer-newdeps.patch +++ b/rpm/SOURCES/openstack-ceilometer-newdeps.patch @@ -1,11 +1,7 @@ -diff -Naur ceilometer-2013.2.b1.orig/ceilometer/__init__.py ceilometer-2013.2.b1/ceilometer/__init__.py ---- ceilometer-2013.2.b1.orig/ceilometer/__init__.py 2013-05-30 15:09:28.000000000 +0000 -+++ ceilometer-2013.2.b1/ceilometer/__init__.py 2013-05-31 16:05:56.366704819 +0000 -@@ -13,3 +13,25 @@ - # License for the specific language governing permissions and limitations - # under the License. - # -+ +diff -Naur ceilometer-2014.1.b2.orig/ceilometer/__init__.py ceilometer-2014.1.b2/ceilometer/__init__.py +--- ceilometer-2014.1.b2.orig/ceilometer/__init__.py 2014-01-23 14:55:44.000000000 +0000 ++++ ceilometer-2014.1.b2/ceilometer/__init__.py 2014-01-27 15:03:39.691353920 +0000 +@@ -0,0 +1,21 @@ +import sys +import pkg_resources + @@ -27,21 +23,3 @@ diff -Naur ceilometer-2013.2.b1.orig/ceilometer/__init__.py ceilometer-2013.2.b1 + +replace_dist("WebOb >= 1.2") +replace_dist("SQLAlchemy >= 0.7.3") -diff -Naur ceilometer-2013.2.b1.orig/ceilometer/storage/sqlalchemy/migration.py ceilometer-2013.2.b1/ceilometer/storage/sqlalchemy/migration.py ---- ceilometer-2013.2.b1.orig/ceilometer/storage/sqlalchemy/migration.py 2013-05-30 15:09:28.000000000 +0000 -+++ ceilometer-2013.2.b1/ceilometer/storage/sqlalchemy/migration.py 2013-05-31 16:03:43.209551099 +0000 -@@ -52,7 +52,13 @@ - - - # NOTE(jkoelker) Delay importing migrate until we are patched --from migrate import exceptions as versioning_exceptions -+try: -+ # Try the more specific path first (migrate <= 0.6) -+ from migrate.versioning import exceptions as versioning_exceptions -+except ImportError: -+ # Use the newer path (migrate >= 0.7) -+ from migrate import exceptions as versioning_exceptions -+ - from migrate.versioning import api as versioning_api - from migrate.versioning.repository import Repository - diff --git a/rpm/SOURCES/openstack-ceilometer-notification.init b/rpm/SOURCES/openstack-ceilometer-notification.init new file mode 100644 index 0000000..2695eca --- /dev/null +++ b/rpm/SOURCES/openstack-ceilometer-notification.init @@ -0,0 +1,102 @@ +#!/bin/sh +# +# openstack-ceilometer-notification OpenStack ceilometer notification agent +# +# chkconfig: - 98 02 +# description: OpenStack measurement and collection agent notification service + +### BEGIN INIT INFO +# Provides: +# Required-Start: $remote_fs $network $syslog +# Required-Stop: $remote_fs $syslog +# Default-Stop: 0 1 6 +# Short-Description: OpenStack ceilometer agent notification service +# Description: OpenStack measurement collection agent notification service +### END INIT INFO + +. /etc/rc.d/init.d/functions + +suffix=agent-notification +prog=openstack-ceilometer-$suffix +exec="/usr/bin/ceilometer-$suffix" +config="/etc/ceilometer/ceilometer.conf" +pidfile="/var/run/ceilometer/ceilometer-$suffix.pid" +logfile="/var/log/ceilometer/$suffix.log" + +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +lockfile=/var/lock/subsys/$prog + +start() { + [ -x $exec ] || exit 5 + [ -f $config ] || exit 6 + echo -n $"Starting $prog: " + daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile" + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc -p $pidfile $prog + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + status -p $pidfile $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? diff --git a/rpm/SOURCES/openstack-ceilometer-notification.upstart b/rpm/SOURCES/openstack-ceilometer-notification.upstart new file mode 100644 index 0000000..f12ad33 --- /dev/null +++ b/rpm/SOURCES/openstack-ceilometer-notification.upstart @@ -0,0 +1,8 @@ +description "OpenStack Ceilometer notification agent" + +start on stopped rc RUNLEVEL=[2345] +stop on runlevel [S016] + +respawn + +exec su -s /bin/sh -c "exec /usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log" ceilometer diff --git a/rpm/SPECS/openstack-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec index 7998873..f4126f3 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: 2013.2 -Release: 1%{?dist} +Version: 2014.1 +Release: 0.3.b3%{?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}.tar.gz +Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.b2.tar.gz Source1: %{pypi_name}-dist.conf Source2: %{pypi_name}.logrotate @@ -26,9 +26,11 @@ Source14: %{name}-alarm-notifier.init Source140: %{name}-alarm-notifier.upstart Source15: %{name}-alarm-evaluator.init Source150: %{name}-alarm-evaluator.upstart +Source16: %{name}-notification.init +Source160: %{name}-notification.upstart # -# patches_base=2013.2 +# patches_base=2014.1.b2 # Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch @@ -47,7 +49,7 @@ BuildRequires: openstack-utils # These are required to build due to the requirements check added BuildRequires: python-sqlalchemy0.7 -BuildRequires: python-webob >= 1.2 +BuildRequires: python-webob1.2 %description @@ -68,10 +70,10 @@ Requires: python-greenlet Requires: python-iso8601 Requires: python-lxml Requires: python-anyjson +Requires: python-jsonpath-rw Requires: python-stevedore Requires: python-msgpack -Requires: python-netaddr -Requires: python-six +Requires: python-six >= 1.4.1 Requires: PyYAML Requires: python-sqlalchemy0.7 @@ -171,7 +173,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: python-pymongo Requires: python-flask Requires: python-pecan -Requires: python-wsme +Requires: python-wsme >= 0.5b6 %description api OpenStack ceilometer provides services to measure and @@ -282,6 +284,7 @@ install -p -D -m 755 %{SOURCE12} %{buildroot}%{_initrddir}/%{name}-compute install -p -D -m 755 %{SOURCE13} %{buildroot}%{_initrddir}/%{name}-central install -p -D -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/%{name}-alarm-notifier install -p -D -m 755 %{SOURCE15} %{buildroot}%{_initrddir}/%{name}-alarm-evaluator +install -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/%{name}-notification # Install upstart jobs examples install -d -m 755 %{buildroot}%{_datadir}/ceilometer @@ -291,6 +294,7 @@ install -p -m 644 %{SOURCE120} %{buildroot}%{_datadir}/ceilometer/ install -p -m 644 %{SOURCE130} %{buildroot}%{_datadir}/ceilometer/ install -p -m 644 %{SOURCE140} %{buildroot}%{_datadir}/ceilometer/ install -p -m 644 %{SOURCE150} %{buildroot}%{_datadir}/ceilometer/ +install -p -m 644 %{SOURCE160} %{buildroot}%{_datadir}/ceilometer/ # Install logrotate install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} @@ -356,7 +360,7 @@ fi %preun collector if [ $1 -eq 0 ] ; then - for svc in collector; do + for svc in collector notification; do /sbin/service %{name}-${svc} stop > /dev/null 2>&1 /sbin/chkconfig --del %{name}-${svc} done @@ -397,7 +401,7 @@ fi %postun collector if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall - for svc in collector; do + for svc in collector notification; do /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || : done fi @@ -443,6 +447,7 @@ fi %{_bindir}/ceilometer-dbsync %{_bindir}/ceilometer-expirer +%{_bindir}/ceilometer-send-sample %defattr(-, ceilometer, ceilometer, -) @@ -469,8 +474,11 @@ fi %files collector %{_bindir}/ceilometer-collector* +%{_bindir}/ceilometer-agent-notification %{_initrddir}/%{name}-collector +%{_initrddir}/%{name}-notification %{_datarootdir}/ceilometer/%{name}-collector.upstart +%{_datarootdir}/ceilometer/%{name}-notification.upstart %files api @@ -496,6 +504,18 @@ fi %changelog +* Mon Jan 27 2014 Pádraig Brady - 2014.1-0.3.b2 +- Update to Icehouse milestone 2 + +* Mon Jan 06 2014 Pádraig Brady - 2014.1-0.2.b1 +- Set python-six min version to ensure updated + +* Mon Dec 23 2013 Pádraig Brady - 2014.1-0.1.b1 +- Update to Icehouse milestone 1 + +* Tue Dec 17 2013 Pádraig Brady - 2013.2.1-1 +- Update to Havana stable release 2013.2.1 + * Thu Oct 17 2013 Pádraig Brady - 2013.2-1 - Update to Havana release