From fffc2d909a8920e415629b027292f9b2200ba15e Mon Sep 17 00:00:00 2001
From: iberezovskiy <iberezovskiy@mirantis.com>
Date: Wed, 2 Jul 2014 23:51:51 +0400
Subject: [PATCH] Update ceilometer requirements for Fuel 5.1

Change-Id: Id42e9e684df7f491617565f4041e5462052edde7
---
 debian/control                      | 52 ++++++++++++++++-------------
 rpm/SPECS/openstack-ceilometer.spec | 11 ++++--
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index 41ed765..f3988b0 100644
--- a/debian/control
+++ b/debian/control
@@ -16,38 +16,41 @@ Build-Depends:
  python-eventlet (>= 0.13.0),
  python-fixtures (>= 0.3.14),
  python-flask (>= 0.10),
+ python-flask (<< 1.0),
  python-glanceclient (>= 1:0.9.3),
  python-httplib2,
- python-happybase (>= 0.4),
- python-iso8601 (>=0.1.8),
+ python-happybase (>= 0.5), python-happybase (<< 0.7) | python-happybase (>> 0.7),
+ python-iso8601 (>= 0.1.9),
  python-jsonpath-rw,
- python-jsonschema (>=2.0.0),
- python-keystoneclient (>= 1:0.4.1),
+ python-jsonschema (>= 2.0.0),
+ python-jsonschema (<< 3.0.0),
+ python-keystoneclient (>= 1:0.7.0),
  python-kombu (>= 2.4.8),
  python-lxml (>= 2.3),
  python-lockfile (>= 0.8),
- python-migrate,
+ python-migrate (>= 0.8.2), python-migrate (<< 0.8.4) | python-migrate (>> 0.8.4),
  python-mock,
  python-mox,
  msgpack-python,
  python-mysqldb,
  python-netaddr (>= 0.7.6),
  python-nova,
- python-novaclient (>= 1:2.15.0),
+ python-novaclient (>= 1:2.17.0),
  python-oslo.config (>= 1:1.2.0),
+ python-oslo.vmware (>= 0.2),
  python-oslo.sphinx,
- python-pbr (>= 0.5.21),
- python-pecan (>= 0.2.0),
+ python-pbr (>= 0.6),
+ python-pecan (>= 0.4.5),
  python-pymongo (>= 2.6),
  python-requests (>= 1.1),
  python-simplejson,
  python-sphinx,
- python-sqlalchemy (>= 0.8.2),
- python-stevedore (>= 0.13),
+ python-sqlalchemy (>= 0.7.8), python-sqlalchemy (<< 0.9.5) | python-sqlalchemy (>> 0.9.5), python-sqlalchemy (<= 0.9.99),
+ python-stevedore (>= 0.14),
  python-subunit,
- python-six (>= 1.4.1),
+ python-six (>= 1.5.2),
  python-swift,
- python-swiftclient (>= 1.5),
+ python-swiftclient (>= 1.6),
  python-testscenarios (>= 0.4),
  python-testtools (>= 0.9.32),
  python-webob (>= 1.2.3),
@@ -68,26 +71,29 @@ Depends:
  python-ceilometerclient (>= 1.0.6),
  python-eventlet (>= 0.13.0),
  python-flask (>= 0.10),
+ python-flask (<< 1.0),
  python-glanceclient (>= 1:0.9.3),
- python-happybase (>= 0.4),
- python-iso8601 (>= 0.1.8),
- python-jsonschema (>=2.0.0),
- python-keystoneclient (>= 1:0.4.1),
+ python-happybase (>= 0.5), python-happybase (<< 0.7) | python-happybase (>> 0.7),
+ python-iso8601 (>= 0.1.9),
+ python-jsonschema (>= 2.0.0),
+ python-jsonschema (<< 3.0.0),
+ python-keystoneclient (>= 1:0.7.0),
  python-kombu (>= 2.4.8),
  python-lxml (>= 2.3),
  python-lockfile (>= 0.8),
- python-migrate,
+ python-migrate (>= 0.8.2), python-migrate (<< 0.8.4) | python-migrate (>> 0.8.4),
  python-netaddr,
- python-novaclient (>= 1:2.15.0),
+ python-novaclient (>= 1:2.17.0),
  python-oslo.config (>= 1:1.2.0),
- python-pecan (>= 0.2.0),
+ python-oslo.vmware (>= 0.2),
+ python-pecan (>= 0.4.5),
  python-pymongo (>= 2.6),
- python-six (>= 1.4.1),
+ python-six (>= 1.5.2),
  python-yaml (>= 3.1.0),
  python-requests (>= 1.1),
- python-sqlalchemy (>= 0.8.2),
- python-stevedore (>= 0.12),
- python-swiftclient (>= 1.5),
+ python-sqlalchemy (>= 0.7.8), python-sqlalchemy (<< 0.9.5) | python-sqlalchemy (>> 0.9.5), python-sqlalchemy (<= 0.9.99),
+ python-stevedore (>= 0.14),
+ python-swiftclient (>= 1.6),
  python-webob (>= 1.2.3),
  python-wsme (>= 0.6),
  ${misc:Depends},
diff --git a/rpm/SPECS/openstack-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec
index b433e1d..0ba7244 100644
--- a/rpm/SPECS/openstack-ceilometer.spec
+++ b/rpm/SPECS/openstack-ceilometer.spec
@@ -68,21 +68,26 @@ Requires:         python-anyjson
 Requires:         python-jsonpath-rw
 Requires:         python-stevedore >= 0.14
 Requires:         python-msgpack
-Requires:         python-six >= 1.6
+Requires:         python-six
 Requires:         PyYAML
 
 Requires:         python-argparse
+Requires:         python-croniter >= 0.3.4
 Requires:         python-jsonschema
+Requires:         python-lockfile >= 0.8
 Requires:         python-netaddr
+Requires:         python-pbr
 Requires:         python-requests
 
-Requires:         python-sqlalchemy
+Requires:         python-sqlalchemy >= 0.7.8, python-sqlalchemy < 0.9.5, python-sqlalchemy > 0.9.5, python-sqlalchemy <= 0.9.99
 Requires:         python-alembic
-Requires:         python-migrate
+Requires:         python-migrate >= 0.8.2, python-migrate < 0.8.4, python-migrate > 0.8.4
+Requires:         python-happybase >= 0.5, python-happybase < 0.7, python-happybase > 0.7
 
 Requires:         python-webob >= 1.2.3
 
 Requires:         python-oslo-config >= 1:1.2.0
+Requires:         python-oslo.vmware >= 0.2
 
 Requires:         pysnmp
 Requires:         pytz
-- 
2.32.3