From a1b2853f97c805f96f5f9991c10e4c2e56b9e326 Mon Sep 17 00:00:00 2001 From: iberezovskiy Date: Mon, 2 Mar 2015 13:04:23 +0300 Subject: [PATCH] Update spec and requirements according to 2014.2.2 version Change-Id: I1e4fe66aa003a89588ac1487fbe9dffa9db9e859 --- debian/changelog | 8 ++++ debian/control | 65 ++++++++++++++--------------- rpm/SPECS/openstack-ceilometer.spec | 61 ++++++++++++++------------- tests/runtests.sh | 15 ++++++- 4 files changed, 85 insertions(+), 64 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0729c78..9f003c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ceilometer (2014.2.2-0ubuntu1) trusty; urgency=medium + + * Update to 2014.2.2 version: + - Sync requirement with + https://github.com/openstack/ceilometer/blob/stable/juno/requirements.txt + + -- Ivan Berezovskiy Mon, 02 Mar 2015 13:03:39 +0300 + ceilometer (2014.2.b1-0ubuntu1) trusty; urgency=medium * Update to 2014.2.b1 version: diff --git a/debian/control b/debian/control index 9d23a34..7a859b4 100644 --- a/debian/control +++ b/debian/control @@ -13,11 +13,11 @@ Build-Depends: python-croniter (>= 0.3.4), python-coverage, python-docutils, - python-eventlet (>= 0.13.0), + python-eventlet (>= 0.15.1), python-fixtures (>= 0.3.14), python-flask (>= 0.10), python-flask (<< 1.0), - python-glanceclient (>= 1:0.13.1), + python-glanceclient (>= 1:0.14.0), python-httplib2, python-happybase (>= 0.5), python-happybase (<< 0.7) | python-happybase (>> 0.7), python-iso8601 (>= 0.1.9), @@ -25,36 +25,36 @@ Build-Depends: python-jsonpath-rw (<< 2.0), python-jsonschema (>= 2.0.0), python-jsonschema (<< 3.0.0), - python-keystoneclient (>= 1:0.9.0), + python-keystoneclient (>= 1:0.10.0), python-keystonemiddleware (>= 1.0.0), python-lxml (>= 2.3), python-lockfile (>= 0.8), - python-migrate (>= 0.9.1), + python-migrate (>= 0.9.1), python-migrate (<< 0.9.2), python-mock, python-mox, python-msgpack (>= 0.4.0), python-mysqldb, - python-netaddr (>= 0.7.6), + python-netaddr (>= 0.7.12), python-nova, - python-novaclient (>= 1:2.17.0), - python-neutronclient (>= 2.3.5), - python-oslo.config (>= 1:1.2.1), - python-oslo.utils (>= 0.1.1), - python-oslo.i18n (>= 0.1.0), + python-novaclient (>= 1:2.18.0), + python-neutronclient (>= 2.3.6), + python-oslo.config (>= 1:1.4.0), + python-oslo.utils (>= 1.0.0), + python-oslo.i18n (>= 1.0.0), python-oslo.sphinx, python-pastedeploy (>= 1.5.0), python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), python-pecan (>= 0.5.0), python-pymongo (>= 2.6), - python-requests (>= 1.1), + python-requests (>= 1.2.1), python-requests (<< 2.2.2), python-simplejson, python-sphinx, - python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.9.5) | python-sqlalchemy (>> 0.9.5), python-sqlalchemy (<= 0.9.99), - python-stevedore (>= 0.14), + python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99), + python-stevedore (>= 1.0.0), python-subunit, python-six (>= 1.7.0), python-swift, - python-swiftclient (>= 2.0.2), + python-swiftclient (>= 2.2.0), python-testscenarios (>= 0.4), python-testtools (>= 0.9.32), python-webob (>= 1.2.3), @@ -73,32 +73,29 @@ Depends: python-argparse, python-croniter (>= 0.3.4), python-ceilometerclient (>= 1.0.6), - python-eventlet (>= 0.13.0), - python-flask (>= 0.10), - python-flask (<< 1.0), - python-glanceclient (>= 1:0.13.1), + python-eventlet (>= 0.15.1), + python-glanceclient (>= 1:0.14.0), python-happybase (>= 0.5), python-happybase (<< 0.7) | python-happybase (>> 0.7), - python-sqlalchemy (<= 0.9.99), python-iso8601 (>= 0.1.9), python-jsonpath-rw (>= 1.2.0), python-jsonpath-rw (<< 2.0), python-jsonschema (>= 2.0.0), python-jsonschema (<< 3.0.0), - python-keystoneclient (>= 1:0.9.0), + python-keystoneclient (>= 1:0.10.0), python-keystonemiddleware (>= 1.0.0), python-lxml (>= 2.3), python-lockfile (>= 0.8), - python-migrate (>= 0.9.1), + python-migrate (>= 0.9.1), python-migrate (<< 0.9.2), python-msgpack (>= 0.4.0), - python-netaddr (>= 0.7.6), - python-neutronclient (>= 2.3.5), - python-novaclient (>= 1:2.17.0), - python-oslo.config (>= 1:1.2.1), - python-oslo.db (>= 0.2.0), - python-oslo.utils (>= 0.1.1), - python-oslo.messaging (>= 1.3.0), - python-oslo.serialization (>= 0.1.0), - python-oslo.vmware (>= 0.4), + python-netaddr (>= 0.7.12), + python-neutronclient (>= 2.3.6), + python-novaclient (>= 1:2.18.0), + python-oslo.config (>= 1:1.4.0), + python-oslo.db (>= 1.0.0), + python-oslo.utils (>= 1.0.0), + python-oslo.messaging (>= 1.4.0), + python-oslo.serialization (>= 1.0.0), + python-oslo.vmware (>= 0.6.0), python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), python-pecan (>= 0.5.0), python-posix-ipc, @@ -106,10 +103,10 @@ Depends: python-six (>= 1.7.0), python-tooz (>= 0.3), python-yaml (>= 3.1.0), - python-requests (>= 1.1), - python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.9.5) | python-sqlalchemy (>> 0.9.5), python-sqlalchemy (<= 0.9.99), - python-stevedore (>= 0.14), - python-swiftclient (>= 2.0.2), + python-requests (>= 1.2.1), python-requests (<< 2.2.2), + python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99), + python-stevedore (>= 1.0.0), + python-swiftclient (>= 2.2.0), python-tz, python-webob (>= 1.2.3), python-wsme (>= 0.6), diff --git a/rpm/SPECS/openstack-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec index 2953954..b3aae08 100644 --- a/rpm/SPECS/openstack-ceilometer.spec +++ b/rpm/SPECS/openstack-ceilometer.spec @@ -3,7 +3,7 @@ %global pypi_name ceilometer Name: openstack-ceilometer -Version: 2014.2.b1 +Version: 2014.2.2 Release: 2%{?dist} Summary: OpenStack measurement collection service @@ -61,43 +61,44 @@ Group: Applications/System Requires: python-qpid Requires: python-babel -Requires: python-eventlet >= 0.13.0 +Requires: python-eventlet >= 0.15.1, python-eventlet <= 0.15.2 Requires: python-iso8601 >= 0.1.9 Requires: python-lxml >= 2.3 Requires: python-anyjson >= 0.3.3 Requires: python-jsonpath-rw >= 1.2.0, python-jsonpath-rw < 2.0 -Requires: python-stevedore >= 0.14 +Requires: python-stevedore >= 1.0.0 Requires: python-msgpack >= 0.4.0 Requires: python-posix_ipc Requires: python-six >= 1.7.0 -Requires: PyYAML +Requires: PyYAML >= 3.1.0 Requires: python-argparse Requires: python-croniter >= 0.3.4 Requires: python-happybase >= 0.5, python-happybase < 0.7, python-happybase > 0.7 Requires: python-jsonschema >= 2.0.0, python-jsonschema < 3.0.0 -Requires: python-lockfile >= 0.8 -Requires: python-netaddr >= 0.7.6 +Requires: python-lockfile == 0.8 +Requires: python-netaddr >= 0.7.12 +Requires: python-ordereddict < 1.2 Requires: python-pbr >= 0.6, python-pbr < 0.7, python-pbr > 0.7, python-pbr < 1.0 -Requires: python-requests >= 1.1 +Requires: python-requests >= 1.2.2, python-requests <= 2.2.1 Requires: python-tooz >= 0.3 -Requires: python-sqlalchemy >= 0.8.4, python-sqlalchemy < 0.95, python-sqlalchemy > 0.9.5, python-sqlalchemy <= 0.9.99 +Requires: python-sqlalchemy >= 0.9.7, python-sqlalchemy <= 0.9.99 Requires: python-alembic >= 0.6.4 -Requires: python-migrate >= 0.9.1 +Requires: python-migrate == 0.9.1 Requires: python-webob >= 1.2.3 -Requires: python-oslo-config >= 1:1.2.1 -Requires: python-oslo.db >= 0.2.0 -Requires: python-oslo-vmware >= 0.4 -Requires: python-oslo-utils >= 0.1.1 -Requires: python-oslo-messaging >= 1.3.0 -Requires: python-oslo.serialization >= 0.1.0 +Requires: python-oslo-config >= 1:1.4.0 +Requires: python-oslo.db >= 1.0.0 +Requires: python-oslo-rootwrap >= 1.3.0 +Requires: python-oslo-vmware >= 0.6.0 +Requires: python-oslo-utils >= 1.0.0 +Requires: python-oslo-messaging >= 1.4.0 +Requires: python-oslo.serialization >= 1.0.0 Requires: pysnmp > 4.2.1, pysnmp < 5.0.0 Requires: pytz -Requires: python-croniter >= 0.3.4 Requires: python-keystonemiddleware >= 1.0.0 Requires: python-paste-deploy >= 1.5.0 @@ -109,11 +110,11 @@ Requires: python-pymongo Requires: python-flask Requires: python-pecan >= 0.5.0 Requires: python-wsme >= 0.6 -Requires: python-neutronclient >= 2.3.5 -Requires: python-novaclient >= 2.17.0 -Requires: python-keystoneclient >= 0.9.0 -Requires: python-glanceclient >= 0.13.1 -Requires: python-swiftclient >= 2.0.2 +Requires: python-neutronclient >= 2.3.6, python-neutronclient < 3 +Requires: python-novaclient >= 2.18.0 +Requires: python-keystoneclient >= 0.10.0 +Requires: python-glanceclient >= 0.14.0 +Requires: python-swiftclient >= 2.2.0 Requires: python-ceilometerclient >= 1.0.6 Requires: libvirt-python @@ -151,8 +152,8 @@ Group: Applications/System Requires: %{name}-common = %{version}-%{release} -Requires: python-novaclient >= 2.17.0 -Requires: python-keystoneclient >= 0.9.0 +Requires: python-novaclient >= 2.18.0 +Requires: python-keystoneclient >= 0.10.0 Requires: libvirt-python %description compute @@ -169,10 +170,10 @@ Group: Applications/System Requires: %{name}-common = %{version}-%{release} -Requires: python-novaclient >= 2.17.0 -Requires: python-keystoneclient >= 0.9.0 -Requires: python-glanceclient >= 0.13.1 -Requires: python-swiftclient >= 2.0.2 +Requires: python-novaclient >= 2.18.0 +Requires: python-keystoneclient >= 0.10.0 +Requires: python-glanceclient >= 0.14.0 +Requires: python-swiftclient >= 2.2.0 %description central OpenStack ceilometer provides services to measure and @@ -224,7 +225,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: python-pymongo Requires: python-flask -Requires: python-pecan >= 0.4.5 +Requires: python-pecan >= 0.5.0 Requires: python-wsme >= 0.6 %description api @@ -568,6 +569,10 @@ fi %changelog +* Mon Mar 2 2015 Ivan Berezovskiy - 2014.2.2 +- Update spec and requirements for current 2014.2.2 version + https://github.com/openstack/ceilometer/blob/stable/juno/requirements.txt + * Fri Jul 4 2014 Ivan Berezovskiy - 2014.2.b1 - Update to upstream 2014.2.b1 - Update requirements diff --git a/tests/runtests.sh b/tests/runtests.sh index 86255b7..e9efc14 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -42,10 +42,19 @@ connection=sqlite:////tmp/ceilometer" > /etc/ceilometer/ceilometer.conf prepare_vm() { if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]; then - apt-get install rabbitmq-server screen python-pip sqlite3 -y + apt-get install screen python-pip sqlite3 -y else - yum install screen rabbitmq-server python-pip sqlite -y + yum install screen python-pip sqlite -y fi +} + +prepare_rabbit() { + if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]; then + apt-get install rabbitmq-server -y + else + yum install rabbitmq-server -y + fi + echo "127.0.10.1 $(hostname)" >> /etc/hosts service rabbitmq-server restart sleep 5 } @@ -110,6 +119,7 @@ case $package in ceilometer-collector|openstack-ceilometer-collector|ceilometer-agent-notification|openstack-ceilometer-notification) prepare_config prepare_vm + prepare_rabbit if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]; then apt-get install ceilometer-collector ceilometer-agent-notification -y @@ -145,6 +155,7 @@ case $package in echo "Testing 'ceilometer-alarm-notifier'" prepare_config prepare_vm + prepare_rabbit screen -dmS ceilometer-alarm-notifier sleep 2 -- 2.32.3