From: Dmitry Burmistrov Date: Thu, 3 Apr 2014 13:01:01 +0000 (+0400) Subject: Update specs to v. 2014.1.rc X-Git-Tag: 2014.1~4 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fbe97740634e9b1a36701dbf3a1ffc0374a91fab;p=openstack-build%2Fceilometer-build.git Update specs to v. 2014.1.rc Change-Id: I999a3bfc518e1a63299d84493d26bb15db076b0d --- diff --git a/debian/changelog b/debian/changelog index 440a8a8..04298bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,42 @@ -ceilometer (2014.1~b3-0ubuntu1~cloud0) precise-icehouse; urgency=low +ceilometer (2014.1~rc1-0ubuntu1~cloud0) precise-icehouse; urgency=medium - * New upstream release for the Ubuntu Cloud Archive. + * New update for the Ubuntu Cloud Archive. - -- Openstack Ubuntu Testing Bot Mon, 27 Jan 2014 04:01:51 -0500 + -- Openstack Ubuntu Testing Bot Tue, 01 Apr 2014 00:14:21 -0400 + +ceilometer (2014.1~rc1-0ubuntu1) trusty; urgency=medium + + * New upstream release. + + -- Corey Bryant Mon, 31 Mar 2014 11:50:09 -0400 + +ceilometer (2014.1~b3-0ubuntu3) trusty; urgency=medium + + * debian/patches/fix-requirements.patch: Explicity disable snmp. + + -- Chuck Short Thu, 20 Mar 2014 13:12:54 -0400 + +ceilometer (2014.1~b3-0ubuntu2) trusty; urgency=medium + + * d/p/default-dbconnection-sqlite.patch: Fix default sqlite connection URL. + * d/control: Fixup typo in notification agent description (LP: #1267127). + + -- James Page Thu, 13 Mar 2014 16:51:52 +0000 + +ceilometer (2014.1~b3-0ubuntu1) trusty; urgency=medium + + * New upstream release. + * debian/patches/debian/patches/default-dbconnection-sqlite.patch: Refreshed. + * debian/patches/fix-setup-requirements.patch: Dropped no longer needed. + * debian/patches/skip-database-tests.patch: Dropped no longer needed. + * debian/patches/revert-keystone-compat.patch: Dropped no longer needed. + * debian/control: + - Bump python-stevedore to 0.13. + - Add python-croniter as a build dependency. + - Suggest python-pysnmp4. + * debian/cielometer-common.install: Add ceilometer-sample + + -- Chuck Short Thu, 06 Mar 2014 14:44:28 -0500 ceilometer (2014.1~b2-0ubuntu1) trusty; urgency=medium diff --git a/debian/control b/debian/control index 91a1a15..e2e2044 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: python-anyjson (>= 0.3.3), python-babel (>= 0.9.6), python-ceilometerclient (>= 1.0.6), + python-croniter, python-coverage, python-docutils, python-eventlet (>= 0.13.0), @@ -40,7 +41,7 @@ Build-Depends: python-simplejson, python-sphinx, python-sqlalchemy (>= 0.8.2), - python-stevedore (>= 0.12), + python-stevedore (>= 0.13), python-subunit, python-six (>= 1.4.1), python-swift, @@ -87,6 +88,7 @@ Depends: python-wsme (>= 0.5b6), ${misc:Depends}, ${python:Depends} +Suggests: python-pysnmp4 Description: ceilometer python libraries Ceilometer aims to deliver a unique point of contact for billing systems to aquire all counters they need to establish customer billing, accross all @@ -208,7 +210,7 @@ Description: ceilometer notification agent . (A ceilometer is an instrument that measures cloud coverage.) . - This package contains the notificaiton agent. + This package contains the notification agent. Package: ceilometer-alarm-evaluator Architecture: all diff --git a/debian/patches/default-dbconnection-sqlite.patch b/debian/patches/default-dbconnection-sqlite.patch index e50b36b..614d3ab 100644 --- a/debian/patches/default-dbconnection-sqlite.patch +++ b/debian/patches/default-dbconnection-sqlite.patch @@ -1,14 +1,5 @@ -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 +index 80964a7..7668dea 100644 --- a/etc/ceilometer/ceilometer.conf.sample +++ b/etc/ceilometer/ceilometer.conf.sample @@ -126,7 +126,7 @@ @@ -20,15 +11,31 @@ index 81ffd8a..88fd045 100644 # If True, SQLite uses synchronous mode (boolean value) #sqlite_synchronous=true -@@ -618,7 +618,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 +-#backend=sqlalchemy ++backend=sqlalchemy + + + # +@@ -610,7 +610,8 @@ # 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-requirements.patch b/debian/patches/fix-requirements.patch new file mode 100644 index 0000000..d14d976 --- /dev/null +++ b/debian/patches/fix-requirements.patch @@ -0,0 +1,14 @@ +Description: Disabled pynsmp. +Author: Chuck Short +Forwarded: Not needed. +diff -Naurp ceilometer-2014.1.b3.orig/requirements.txt ceilometer-2014.1.b3/requirements.txt +--- ceilometer-2014.1.b3.orig/requirements.txt 2014-03-06 11:33:29.000000000 -0500 ++++ ceilometer-2014.1.b3/requirements.txt 2014-03-20 12:49:30.262158266 -0400 +@@ -16,7 +16,6 @@ oslo.config>=1.2.0 + oslo.vmware + pbr>=0.6,<1.0 + pecan>=0.4.5 +-pysnmp>=4.2.1,<5.0.0 + python-ceilometerclient>=1.0.6 + python-glanceclient>=0.9.0 + python-keystoneclient>=0.6.0 diff --git a/debian/patches/series b/debian/patches/series index cf0a5a4..533e68a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ default-dbconnection-sqlite.patch -#skip-database-tests.patch -fix-setup-requirements.patch -#revert-keystone-compat.patch +fix-requirements.patch diff --git a/debian/rules b/debian/rules index 3d1fddc..a4a1401 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,9 @@ get-orig-source: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: + patch -p1 -R < debian/patches/default-dbconnection-sqlite.patch testr init && PYTHONPATH="$(CURDIR)" testr run || true + patch -p1 < debian/patches/default-dbconnection-sqlite.patch endif override_dh_install: 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 cc7323f..4ebc58d 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,4 +1,4 @@ -From f333383a69562f575e47f128dc98744fd4813c78 Mon Sep 17 00:00:00 2001 +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 @@ -6,7 +6,7 @@ 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 file changed, 1 deletion(-) + 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 02e97e1..4db8a9a 100644 @@ -20,6 +20,3 @@ index 02e97e1..4db8a9a 100644 'sphinx.ext.todo', 'sphinxcontrib.autohttp.flask', 'wsmeext.sphinxext', --- -1.7.9.5 - diff --git a/rpm/SPECS/openstack-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec index f4126f3..18786c2 100644 --- a/rpm/SPECS/openstack-ceilometer.spec +++ b/rpm/SPECS/openstack-ceilometer.spec @@ -4,13 +4,13 @@ Name: openstack-ceilometer Version: 2014.1 -Release: 0.3.b3%{?dist} +Release: 0.6.rc1%{?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}.b2.tar.gz +Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.rc1.tar.gz Source1: %{pypi_name}-dist.conf Source2: %{pypi_name}.logrotate @@ -30,7 +30,7 @@ Source16: %{name}-notification.init Source160: %{name}-notification.upstart # -# patches_base=2014.1.b2 +# patches_base=2014.1.rc1 # Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch @@ -65,13 +65,14 @@ Requires: python-qpid Requires: python-kombu Requires: python-amqplib +Requires: python-babel Requires: python-eventlet Requires: python-greenlet Requires: python-iso8601 Requires: python-lxml Requires: python-anyjson Requires: python-jsonpath-rw -Requires: python-stevedore +Requires: python-stevedore >= 0.14 Requires: python-msgpack Requires: python-six >= 1.4.1 Requires: PyYAML @@ -84,6 +85,10 @@ Requires: python-webob >= 1.2 Requires: python-oslo-config >= 1:1.2.0 +Requires: pysnmp +Requires: pytz +Requires: python-croniter + %description -n python-ceilometer OpenStack ceilometer provides services to measure and collect metrics from OpenStack components. @@ -172,8 +177,8 @@ Requires: %{name}-common = %{version}-%{release} Requires: python-pymongo Requires: python-flask -Requires: python-pecan -Requires: python-wsme >= 0.5b6 +Requires: python-pecan >= 0.4.5 +Requires: python-wsme >= 0.6 %description api OpenStack ceilometer provides services to measure and @@ -504,6 +509,15 @@ fi %changelog +* Mon Mar 31 2014 Pádraig Brady 2014.1-0.6.rc1 +- Update to upstream 2014.1.rc1 + +* Fri Mar 14 2014 Pádraig Brady - 2014.1-0.5.b3 +- Update to Icehouse milestone 3 + +* Tue Feb 04 2014 Pádraig Brady - 2014.1-0.4.b2 +- Fix missing dependency on python-babel + * Mon Jan 27 2014 Pádraig Brady - 2014.1-0.3.b2 - Update to Icehouse milestone 2