Update Neutron dependencies for 2014.2.2 version

Updated dependencies for Neutron packages according to Juno requirements [1] [2]

[1] https://github.com/openstack/requirements/blob/stable/juno/global-requirements.txt
[2] https://github.com/openstack/neutron/blob/stable/juno/requirements.txt

Change-Id: Ia0816bb1565cf09e0d2abd3f97917fcaccc9dd29

diff --git a/debian/changelog b/debian/changelog
index 9fdd72944a4bee7480eae0674336ef8c181bd8d4..971c568d2a1d03813095634bfd880d73fc7b5064 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+neutron (1:2014.2.2-0ubuntu1) utopic; urgency=medium
+
+  * Updated dependencies according to Juno requirements
+
+ -- Sergey Kolekonov <skolekonov@miranis.com>  Fri, 27 Feb 2015 13:30:51 +0300
+
 neutron (1:2014.2~b2-0ubuntu1) utopic; urgency=medium
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index f172cea4320d3f49701ca46a3975c15c467b37a9..5b485f72c4d9c2453b4b009363ac4c181ab5b696 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,17 +5,17 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Chuck Short <zulcss@ubuntu.com>
 Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
 Build-Depends-Indep:
- alembic (>= 0.4.1),
+ alembic (>= 0.6.4),
  pep8,
  python-amqplib (>= 0.6.1),
  python-anyjson (>= 0.3.3),
  python-babel,
- python-cliff (>= 1.4),
+ python-cliff (>= 1.7.0),
  python-configobj,
  python-coverage,
  python-hacking,
  python-eventlet (>= 0.15.1),
- python-fixtures (>= 0.3.12),
+ python-fixtures (>= 0.3.14),
  python-greenlet (>= 0.3.2),
  python-httplib2 (>= 0.7.5),
  python-iso8601 (>= 0.1.9),
@@ -23,33 +23,33 @@ Build-Depends-Indep:
  python-jsonrpclib,
  python-keystonemiddleware (>= 1.0.0),
  python-keystoneclient (>= 1:0.10.0),
- python-kombu (>= 2.5.12),
+ python-kombu (>= 3.0.7),
  python-lxml (>= 2.3),
- python-mock (>= 1.0b1),
+ python-mock (>= 1.0),
  python-mox,
  python-netaddr,
  python-neutronclient (>= 1:2.3.6),
- python-novaclient (>= 2.17.0),
+ python-novaclient (>= 1:2.18.0),
  python-oslo.config (>= 1.4.0),
  python-oslo.messaging (>= 1.4.0),
  python-oslo.db,
  python-paste,
  python-pastedeploy,
  python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0),
- python-psutil (>= 0.6.1),
+ python-psutil (>= 1.1.1),
  python-pyudev,
- python-requests (>= 1.1),
+ python-requests (>= 2.1.0), python-requests (<< 2.2.2),
  python-routes,
  python-setuptools,
  python-simplejson,
  python-six (>= 1.7.0),
  python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.8.99) | python-sqlalchemy (>> 0.9.7), python-sqlalchemy (<= 0.9.99),
- python-stevedore (>= 0.14),
- python-testtools (>= 0.9.32),
+ python-stevedore (>= 1.0.0),
+ python-testtools (>= 0.9.34),
  python-webob,
  python-webtest,
  subunit,
- testrepository ( >= 0.0.17)
+ testrepository ( >= 0.0.18)
 XS-Python-Version: >= 2.6
 Standards-Version: 3.9.4
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/neutron/juno/files
@@ -433,27 +433,27 @@ Depends:
  python-anyjson (>= 0.3.3),
  python-argparse,
  python-babel,
- python-eventlet (>= 0.13.0),
- python-greenlet (>= 0.3.12),
+ python-eventlet (>= 0.15.1),
+ python-greenlet (>= 0.3.2),
  python-httplib2 (>= 0.7.5),
  python-iso8601 (>= 0.1.9),
  python-jinja2,
  python-keystonemiddleware (>= 1.0.0),
  python-keystoneclient (>= 1:0.10.0),
- python-kombu (>= 2.5.12),
- python-netaddr (>= 0.7.6 ),
+ python-kombu (>= 3.0.7),
+ python-netaddr (>= 0.7.12 ),
  python-neutronclient (>= 1:2.3.6),
- python-novaclient (>=         1:2.17.0),
+ python-novaclient (>= 1:2.18.0),
  python-oslo.config (>= 1:1.4.0),
  python-paste,
  python-pastedeploy(>= 1.5),
- python-psutil (>= 0.6.1),
- python-requests (>= 1.1),
- python-oslo.rootwrap (>= 1.3.0a1),
+ python-psutil (>= 1.1.1),
+ python-requests (>= 2.1.0), python-requests (<< 2.2.2),
+ python-oslo.rootwrap (>= 1.3.0),
  python-routes,
  python-six (>= 1.7.0),
  python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.8.99) | python-sqlalchemy (>> 0.9.7), python-sqlalchemy (<= 0.9.99),
- python-stevedore (>= 0.14),
+ python-stevedore (>= 1.0.0),
  python-webob,
  ${misc:Depends},
  ${python:Depends}

diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec
index aa273fbc9f522aad7c015064a77beb66a3c2c6fc..ba2fd0a5ae7b53c88310228a4ea006c148ef4b11 100644 (file)
--- a/rpm/SPECS/openstack-neutron.spec
+++ b/rpm/SPECS/openstack-neutron.spec
@@ -1,8 +1,8 @@
 %global release_name icehouse
 
 Name:          openstack-neutron
-Version:        2014.2
-Release:        1%{?dist}
+Version:    2014.2.2
+Release:    1%{?dist}
 Provides:      openstack-quantum = %{version}-%{release}
 Obsoletes:     openstack-quantum < 2013.2-0.3.b3
 
@@ -12,7 +12,7 @@ Group:                Applications/System
 License:       ASL 2.0
 URL:           http://launchpad.net/neutron/
 
-Source0: neutron-2014.2.tar.gz
+Source0:    neutron-2014.2.tar.gz
 Source1:       neutron.logrotate
 Source2:       neutron-sudoers
 
@@ -109,28 +109,28 @@ Requires: python-eventlet >= 0.15.1
 Requires:      python-greenlet >= 0.3.2
 Requires:      python-httplib2 >= 0.7.5
 Requires:      python-iso8601 >= 0.1.9
-Requires:       python-jsonrpclib
+Requires:   python-jsonrpclib
 Requires:      python-jinja2
 Requires:      python-keystoneclient >= 1:0.10.0
-Requires:       python-keystonemiddleware >= 1.0.0
-Requires:      python-kombu >= 2.4.8
+Requires:   python-keystonemiddleware >= 1.0.0
+Requires:      python-kombu >= 3.0.7
 Requires:      python-lxml
-Requires:       python-oslo-messaging >= 1.4.0
+Requires:   python-oslo-messaging >= 1.4.0
 Requires:      python-oslo-rootwrap >= 1.3.0
-Requires:       python-requests >= 1.2.1
+Requires:   python-requests >= 2.1.0, python-requests <= 2.2.1
 Requires:      python-paste-deploy >= 1.5.0
 Requires:      python-routes >= 1.12.3
 Requires:      python-sqlalchemy >= 0.8.4
 Requires:      python-webob >= 1.2.3
-Requires:      python-netaddr >= 0.7.6
+Requires:      python-netaddr >= 0.7.12
 Requires:      python-oslo-config >= 1.4.0
-Requires:       python-oslo-db >= 0.4.0
+Requires:   python-oslo-db >= 1.0.0
 Requires:      python-qpid
 Requires:      python-neutronclient >= 2.3.6
-Requires:      python-stevedore >= 0.14
+Requires:      python-stevedore >= 1.0.0
 Requires:      python-six >= 1.7.0
 
-Requires:   python-novaclient >= 1:2.17.0
+Requires:   python-novaclient >= 1:2.18.0
 Requires:      sudo
 
 
@@ -1095,6 +1095,9 @@ fi
 
 
 %changelog
+* Fri Feb 27 2015 Sergey Kolekonov <skolekonov@mirantis.com> 2014.2.2
+- Update dependencies according to Juno requirements
+
 * Tue Aug 19 2014 Jenkins <jenkins@review.openstack.org> - 2014.2.b2-fuel5.1.mira0
 - 921969d Merge "Remove INACTIVE status from FWaaS"
 - 0954a7a Merge "Skip FWaaS config mismatch check if RPC method is unsupported"