Update neutron to 9.0.0~b3

Xenial:
- Update requirements based on project requirements
- Add missing dependencies (radvd, python-openvswitch, python-pyroute2)
  Commits a5a14ee 918a100 f28290b
- Add doc package and git as a build dependency

Centos7:
- Update requirements based on project requirements
- Add doc package

Change-Id: I96aa0ae89a7ca04532884e262d5e4323deecf770

diff --git a/centos7/rpm/SPECS/openstack-neutron.spec b/centos7/rpm/SPECS/openstack-neutron.spec
index 25d1ab13dcbdcbf046c440c37a77a5fce9e640f2..0b9b8c36969de021d73a1b5ad94fba5546973735 100644 (file)
--- a/centos7/rpm/SPECS/openstack-neutron.spec
+++ b/centos7/rpm/SPECS/openstack-neutron.spec
@@ -1,8 +1,8 @@
 %global service neutron
 
 Name:           openstack-%{service}
-Version:        9.0.0~b2
-Release:        3%{?dist}
+Version:        9.0.0~b3
+Release:        1%{?dist}
 Epoch:          1
 Summary:        OpenStack Networking Service
 
@@ -36,7 +36,7 @@ BuildRequires:  python2-devel
 BuildRequires:  python-d2to1
 BuildRequires:  python-keystoneauth1 >= 2.10.0
 BuildRequires:  python-keystonemiddleware
-BuildRequires:  python-neutron-lib >= 0.3.0
+BuildRequires:  python-neutron-lib >= 0.4.0
 BuildRequires:  python-novaclient
 BuildRequires:  python-oslo-cache
 BuildRequires:  python-oslo-concurrency
@@ -48,7 +48,7 @@ BuildRequires:  python-oslo-policy
 BuildRequires:  python-oslo-rootwrap
 BuildRequires:  python-oslo-service
 BuildRequires:  python-oslo-versionedobjects
-BuildRequires:  python-osprofiler >= 1.3.0
+BuildRequires:  python-osprofiler >= 1.4.0
 BuildRequires:  python-pbr >= 1.6
 BuildRequires:  python-pecan
 BuildRequires:  python-setuptools
@@ -112,14 +112,14 @@ Requires:       python-keystoneauth1 >= 2.10.0
 Requires:       python-keystonemiddleware >= 4.0.0
 Requires:       python-netaddr >= 0.7.12
 Requires:       python-netifaces >= 0.10.4
-Requires:       python-neutronclient >= 4.2.0
-Requires:       python-neutron-lib >= 0.3.0
+Requires:       python-neutronclient >= 5.1.0
+Requires:       python-neutron-lib >= 0.4.0
 Requires:       python-novaclient >= 2.29.0
 Requires:       python-openvswitch
 Requires:       python-oslo-cache >= 1.5.0
 Requires:       python-oslo-concurrency >= 3.8.0
 Requires:       python-oslo-config >= 2:3.14.0
-Requires:       python-oslo-context >= 2.6.0
+Requires:       python-oslo-context >= 2.9.0
 Requires:       python-oslo-db >= 4.10.0
 Requires:       python-oslo-i18n >= 2.1.0
 Requires:       python-oslo-log >= 1.14.0
@@ -132,7 +132,7 @@ Requires:       python-oslo-serialization >= 1.10.0
 Requires:       python-oslo-service >= 1.10.0
 Requires:       python-oslo-utils >= 3.16.0
 Requires:       python-oslo-versionedobjects >= 1.13.1
-Requires:       python-osprofiler >= 1.3.0
+Requires:       python-osprofiler >= 1.4.0
 Requires:       python-paste
 Requires:       python-paste-deploy >= 1.5.0
 Requires:       python-pecan >= 1.0.0
@@ -722,6 +722,8 @@ fi
 
 
 %changelog
+* Fri Sep 9 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:9.0.0~b3-1.el7
+- Update specs for Newton b3 release
 * Tue Aug 16 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:9.0.0~b2-3.el7
 - Update requirements
 * Wed Jul 19 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:9.0.0~b2-2.el7

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 2e265cb4283b90ddfe44566e820a1e6c8271467a..31d52164f9778d482fc5bd52d903ec111176f207 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,10 @@
+neutron (2:9.0.0~b3-1~u16.04+mos1) mos10.0; urgency=medium
+
+  * Update to latest  Newton b3 release
+  * Requirements update based on project requirements
+
+ -- Jerzy Mikolajczak <jmikolajczak@mirantis.com>  Fri, 09 Sep 2016 10:06:25 +0200
+
 neutron (2:9.0.0~b2-3~u16.04+mos1) mos10.0; urgency=medium
 
   * Update requirements

diff --git a/xenial/debian/control b/xenial/debian/control
index fd579da5a0c2fd3788cf2cf77ed5a25cc09ceeba..a9dce559f9cf93cbac27d0cec4219532e7c2bc99 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -57,7 +57,7 @@ Build-Depends-Indep: alembic (>= 0.8.4),
                      python-oslo.versionedobjects (>= 1.13.0),
                      python-oslosphinx (>= 2.5.0),
                      python-oslotest (>= 1.10.0),
-                     python-osprofiler (>= 1.3.0),
+                     python-osprofiler (>= 1.4.0),
                      python-paste,
                      python-pastedeploy,
                      python-pecan (>= 1.0.0),
@@ -94,22 +94,22 @@ Depends: alembic (>= 0.8.4),
          python-debtcollector (>= 1.2.0),
          python-designateclient (>= 1.5.0),
          python-eventlet (>= 0.18.4),
-         python-greenlet,
-         python-httplib2,
+         python-greenlet (>= 0.3.2),
+         python-httplib2 (>= 0.7.5),
          python-jinja2 (>= 2.8),
          python-keystoneauth1 (>= 2.10.0),
          python-keystonemiddleware (>= 4.0.0),
          python-mysqldb,
          python-netaddr (>= 0.7.12),
          python-netifaces (>= 0.10.4),
-         python-neutron-lib (>= 0.3.0),
-         python-neutronclient (>= 1:4.2.0),
+         python-neutron-lib (>= 0.4.0),
+         python-neutronclient (>= 1:5.1.0),
          python-novaclient (>= 2:2.30.1),
          python-openvswitch,
          python-oslo.cache (>= 1.5.0),
          python-oslo.concurrency (>= 3.8.0),
          python-oslo.config (>= 1:3.14.0),
-         python-oslo.context (>= 2.6.0),
+         python-oslo.context (>= 2.9.0),
          python-oslo.db (>= 4.10.0),
          python-oslo.i18n (>= 2.1.0),
          python-oslo.log (>= 2.0.0),
@@ -122,7 +122,7 @@ Depends: alembic (>= 0.8.4),
          python-oslo.service (>= 1.10.0),
          python-oslo.utils (>= 3.16.0),
          python-oslo.versionedobjects (>= 1.13.0),
-         python-osprofiler (>= 1.3.0),
+         python-osprofiler (>= 1.4.0),
          python-paste,
          python-pastedeploy,
          python-pbr (>= 1.8),

diff --git a/xenial/debian/patches/fix-no-attribute-code.patch b/xenial/debian/patches/fix-no-attribute-code.patch
deleted file mode 100644 (file)
index 37f0125..0000000
--- a/xenial/debian/patches/fix-no-attribute-code.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- neutron.orig/neutron/db/api.py     2016-08-18 17:21:13.507395437 +0200
-+++ neutron/neutron/db/api.py  2016-08-18 17:22:04.214899405 +0200
-@@ -21,13 +21,11 @@
- from oslo_db import api as oslo_db_api
- from oslo_db import exception as db_exc
- from oslo_db.sqlalchemy import enginefacade
--from oslo_log import log as logging
- from oslo_utils import excutils
- import osprofiler.sqlalchemy
- import six
- import sqlalchemy
- from sqlalchemy.orm import exc
--import traceback
- 
- from neutron.common import exceptions
- from neutron.common import profiler  # noqa
-@@ -45,7 +43,6 @@
- 
- 
- MAX_RETRIES = 10
--LOG = logging.getLogger(__name__)
- 
- 
- def is_retriable(e):
-@@ -59,7 +56,7 @@
- is_deadlock = moves.moved_function(is_retriable, 'is_deadlock', __name__,
-                                    message='use "is_retriable" instead',
-                                    version='newton', removal_version='ocata')
--_retry_db_errors = oslo_db_api.wrap_db_retry(
-+retry_db_errors = oslo_db_api.wrap_db_retry(
-     max_retries=MAX_RETRIES,
-     retry_interval=0.1,
-     inc_retry_interval=True,
-@@ -67,22 +64,6 @@
- )
- 
- 
--def retry_db_errors(f):
--    """Log retriable exceptions before retry to help debugging."""
--
--    @_retry_db_errors
--    @six.wraps(f)
--    def wrapped(*args, **kwargs):
--        try:
--            return f(*args, **kwargs)
--        except Exception as e:
--            with excutils.save_and_reraise_exception():
--                if is_retriable(e):
--                    LOG.debug("Retry wrapper got retriable exception: %s",
--                              traceback.format_exc())
--    return wrapped
--
--
- def reraise_as_retryrequest(f):
-     """Packs retriable exceptions into a RetryRequest."""
- 

diff --git a/xenial/debian/patches/fix-requirements.txt.patch b/xenial/debian/patches/fix-requirements.txt.patch
index 9463f74610e5c3be0a38abb991bd480af1fe343f..4b12e63c5d007a0f7e934f63073aaac7c508539c 100644 (file)
--- a/xenial/debian/patches/fix-requirements.txt.patch
+++ b/xenial/debian/patches/fix-requirements.txt.patch
@@ -1,18 +1,18 @@
 Description: Fix requirements.txt
 Author: Jerzy Mikolajczak <jmikolajczak@mirantis.com>
 Forwarded: not-needed
-Last-Update: 2016-08-16
+Last-Update: 2016-09-09
 
 Index: neutron/requirements.txt
 ===================================================================
---- neutron.orig/requirements.txt      2016-08-16 18:36:34.568665027 +0200
-+++ neutron/requirements.txt   2016-08-16 18:37:32.220008362 +0200
+--- neutron.orig/requirements.txt      2016-09-09 10:22:58.926849909 +0200
++++ neutron/requirements.txt   2016-09-09 10:23:31.646525138 +0200
 @@ -44,8 +44,6 @@
  oslo.utils>=3.16.0 # Apache-2.0
  oslo.versionedobjects>=1.13.0 # Apache-2.0
- osprofiler>=1.3.0 # Apache-2.0
+ osprofiler>=1.4.0 # Apache-2.0
 -ovs>=2.5.0;python_version=='2.7' # Apache-2.0
--ovs>=2.6.0.dev1;python_version>='3.4' # Apache-2.0
+-ovs>=2.6.0.dev3;python_version>='3.4' # Apache-2.0
  
  python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
  python-designateclient>=1.5.0 # Apache-2.0

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 5de86191dd166bd2f661413b22e76956403d0b5e..bb52e829d3c5ab0e2a6ad57e072819c7e53855c5 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -1,2 +1 @@
 fix-requirements.txt.patch
-fix-no-attribute-code.patch
\ No newline at end of file