Code Review / openstack-build / neutron-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: c198a1a)
Requirements update for 9.0.0~b2 15/25115/6
authorJerzy Mikolajczak <jmikolajczak@mirantis.com>
Tue, 16 Aug 2016 16:26:00 +0000 (18:26 +0200)
committerJerzy Mikolajczak <jmikolajczak@mirantis.com>
Thu, 18 Aug 2016 15:28:54 +0000 (17:28 +0200)
Add temporary patch that is reverting:
https://review.openstack.org/#/c/340223

Without this patch builds are failing with this errors:
http://paste.openstack.org/show/560790/

Change-Id: Ic05be6e43f904b7e74a3b870174bbafd29b9daed

centos7/rpm/SPECS/openstack-neutron.spec patch | blob | history
xenial/debian/changelog patch | blob | history
xenial/debian/control patch | blob | history
xenial/debian/patches/fix-no-attribute-code.patch [new file with mode: 0644] patch | blob
xenial/debian/patches/fix-requirements.txt.patch patch | blob | history
xenial/debian/patches/series patch | blob | history
xenial/debian/rules patch | blob | history

diff --git a/centos7/rpm/SPECS/openstack-neutron.spec b/centos7/rpm/SPECS/openstack-neutron.spec
index fd5bb1a2cf0e761d48b42a43afa044d97f6b6fdb..25d1ab13dcbdcbf046c440c37a77a5fce9e640f2 100644 (file)
--- a/centos7/rpm/SPECS/openstack-neutron.spec
+++ b/centos7/rpm/SPECS/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:           openstack-%{service}
 Version:        9.0.0~b2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        OpenStack Networking Service
 
@@ -32,12 +32,11 @@ Source32:       neutron-linuxbridge-cleanup.service
 BuildArch:      noarch
 
 BuildRequires:  git
-BuildRequires:  python-backports-ssl_match_hostname
 BuildRequires:  python2-devel
 BuildRequires:  python-d2to1
-BuildRequires:  python-keystoneauth1 >= 2.1.0
+BuildRequires:  python-keystoneauth1 >= 2.10.0
 BuildRequires:  python-keystonemiddleware
-BuildRequires:  python-neutron-lib >= 0.2.0
+BuildRequires:  python-neutron-lib >= 0.3.0
 BuildRequires:  python-novaclient
 BuildRequires:  python-oslo-cache
 BuildRequires:  python-oslo-concurrency
@@ -109,30 +108,30 @@ Requires:       python-eventlet >= 0.18.2
 Requires:       python-greenlet >= 0.3.2
 Requires:       python-httplib2 >= 0.7.5
 Requires:       python-jinja2 >= 2.8
-Requires:       python-keystoneauth1 >= 2.7.0
-Requires:       python-keystoneclient >= 1.6.0
+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.2.0
+Requires:       python-neutron-lib >= 0.3.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.12.0
-Requires:       python-oslo-context >= 2.4.0
-Requires:       python-oslo-db >= 4.1.0
+Requires:       python-oslo-config >= 2:3.14.0
+Requires:       python-oslo-context >= 2.6.0
+Requires:       python-oslo-db >= 4.10.0
 Requires:       python-oslo-i18n >= 2.1.0
 Requires:       python-oslo-log >= 1.14.0
 Requires:       python-oslo-messaging >= 5.2.0
 Requires:       python-oslo-middleware >= 3.0.0
 Requires:       python-oslo-policy >= 1.9.0
 Requires:       python-oslo-reports >= 0.6.0
-Requires:       python-oslo-rootwrap >= 2.0.0
+Requires:       python-oslo-rootwrap >= 5.0.0
 Requires:       python-oslo-serialization >= 1.10.0
 Requires:       python-oslo-service >= 1.10.0
-Requires:       python-oslo-utils >= 3.15.0
-Requires:       python-oslo-versionedobjects >= 1.9.1
+Requires:       python-oslo-utils >= 3.16.0
+Requires:       python-oslo-versionedobjects >= 1.13.1
 Requires:       python-osprofiler >= 1.3.0
 Requires:       python-paste
 Requires:       python-paste-deploy >= 1.5.0
@@ -145,8 +144,7 @@ Requires:       python-routes >= 1.12.3
 Requires:       python-ryu >= 3.30
 Requires:       python-six >= 1.9.0
 Requires:       python-sqlalchemy >= 1.0.10
-Requires:       python-stevedore >= 1.15.0
-Requires:       python-unicodecsv
+Requires:       python-stevedore >= 1.16.0
 Requires:       python-webob >= 1.2.3
 
 
@@ -724,6 +722,8 @@ fi
 
 
 %changelog
+* 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
 - Update specs for Newton b2 release
 * Mon Jul 18 2016 Sergey Kolekonov <skolekonov@mirantis.com> 1:9.0.0~b2-1.el7
diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 8951dd486fbddc721b19185565a458c32a156ee8..2e265cb4283b90ddfe44566e820a1e6c8271467a 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,9 @@
+neutron (2:9.0.0~b2-3~u16.04+mos1) mos10.0; urgency=medium
+
+  * Update requirements
+
+ -- Jerzy Mikolajczak <jmikolajczak@mirantis.com>  Tue, 16 Aug 2016 18:21:44 +0200
+
 neutron (2:9.0.0~b2-2~u16.04+mos1) mos10.0; urgency=medium
 
   * Enable rootwrap daemon for neutron
diff --git a/xenial/debian/control b/xenial/debian/control
index 1c9537c28935010e0cce91dadbb6876f86a92900..fd579da5a0c2fd3788cf2cf77ed5a25cc09ceeba 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -29,32 +29,32 @@ Build-Depends-Indep: alembic (>= 0.8.4),
                      python-hacking,
                      python-httplib2,
                      python-jinja2 (>= 2.8),
-                     python-keystoneauth1 (>= 2.7.0),
+                     python-keystoneauth1 (>= 2.10.0),
                      python-keystonemiddleware (>= 4.0.0),
-                     python-mock (>= 1.3),
+                     python-mock (>= 2.0),
                      python-netaddr (>= 0.7.12),
                      python-netifaces (>= 0.10.4),
-                     python-neutron-lib (>= 0.2.0),
+                     python-neutron-lib (>= 0.3.0),
                      python-neutronclient (>= 1:4.2.0),
                      python-novaclient (>= 2:2.30.1),
                      python-openvswitch,
                      python-os-testr (>= 0.7.0),
                      python-oslo.cache (>= 1.5.0),
                      python-oslo.concurrency (>= 3.8.0),
-                     python-oslo.config (>= 1:3.10.0),
-                     python-oslo.context (>= 2.4.0),
-                     python-oslo.db (>= 4.1.0),
+                     python-oslo.config (>= 1:3.14.0),
+                     python-oslo.context (>= 2.6.0),
+                     python-oslo.db (>= 4.10.0),
                      python-oslo.i18n (>= 2.1.0),
                      python-oslo.log (>= 2.0.0),
                      python-oslo.messaging (>= 5.2.0),
                      python-oslo.middleware (>= 3.0.0),
                      python-oslo.policy (>= 1.9.0),
                      python-oslo.reports (>= 0.6.0),
-                     python-oslo.rootwrap (>= 2.0.0),
+                     python-oslo.rootwrap (>= 5.0.0),
                      python-oslo.serialization (>= 2.0.0),
                      python-oslo.service (>= 1.10.0),
-                     python-oslo.utils (>= 3.14.0),
-                     python-oslo.versionedobjects (>= 1.9.1),
+                     python-oslo.utils (>= 3.16.0),
+                     python-oslo.versionedobjects (>= 1.13.0),
                      python-oslosphinx (>= 2.5.0),
                      python-oslotest (>= 1.10.0),
                      python-osprofiler (>= 1.3.0),
@@ -64,13 +64,13 @@ Build-Depends-Indep: alembic (>= 0.8.4),
                      python-pymysql,
                      python-pyudev,
                      python-requests (>= 2.10.0),
-                     python-requests-mock (>= 0.7.0),
+                     python-requests-mock,
                      python-retrying,
                      python-routes,
                      python-ryu (>= 3.30),
                      python-six (>= 1.9.0),
                      python-sqlalchemy (>= 1.0.12),
-                     python-stevedore (>= 1.10.0),
+                     python-stevedore (>= 1.16.0),
                      python-testresources,
                      python-testscenarios,
                      python-testtools (>= 1.4.0),
@@ -94,35 +94,34 @@ Depends: alembic (>= 0.8.4),
          python-debtcollector (>= 1.2.0),
          python-designateclient (>= 1.5.0),
          python-eventlet (>= 0.18.4),
-         python-gflags,
          python-greenlet,
          python-httplib2,
          python-jinja2 (>= 2.8),
-         python-keystoneauth1 (>= 2.7.0),
+         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.2.0),
+         python-neutron-lib (>= 0.3.0),
          python-neutronclient (>= 1:4.2.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.10.0),
-         python-oslo.context (>= 2.4.0),
-         python-oslo.db (>= 4.1.0),
+         python-oslo.config (>= 1:3.14.0),
+         python-oslo.context (>= 2.6.0),
+         python-oslo.db (>= 4.10.0),
          python-oslo.i18n (>= 2.1.0),
          python-oslo.log (>= 2.0.0),
          python-oslo.messaging (>= 5.2.0),
          python-oslo.middleware (>= 3.0.0),
          python-oslo.policy (>= 1.9.0),
          python-oslo.reports (>= 0.6.0),
-         python-oslo.rootwrap (>= 2.0.0),
+         python-oslo.rootwrap (>= 5.0.0),
          python-oslo.serialization (>= 2.0.0),
          python-oslo.service (>= 1.10.0),
-         python-oslo.utils (>= 3.14.0),
-         python-oslo.versionedobjects (>= 1.9.1),
+         python-oslo.utils (>= 3.16.0),
+         python-oslo.versionedobjects (>= 1.13.0),
          python-osprofiler (>= 1.3.0),
          python-paste,
          python-pastedeploy,
@@ -138,7 +137,7 @@ Depends: alembic (>= 0.8.4),
          python-ryu (>= 3.30),
          python-six (>= 1.9.0),
          python-sqlalchemy (>= 1.0.12),
-         python-stevedore (>= 1.10.0),
+         python-stevedore (>= 1.16.0),
          python-webob,
          ${misc:Depends},
          ${python:Depends},
diff --git a/xenial/debian/patches/fix-no-attribute-code.patch b/xenial/debian/patches/fix-no-attribute-code.patch
new file mode 100644 (file)
index 0000000..37f0125
--- /dev/null
+++ b/xenial/debian/patches/fix-no-attribute-code.patch
@@ -0,0 +1,56 @@
+--- 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 6c8d3e8fceceebf9ae0b11b841c8e3db4ae4940e..9463f74610e5c3be0a38abb991bd480af1fe343f 100644 (file)
--- a/xenial/debian/patches/fix-requirements.txt.patch
+++ b/xenial/debian/patches/fix-requirements.txt.patch
@@ -1,14 +1,14 @@
 Description: Fix requirements.txt
 Author: Jerzy Mikolajczak <jmikolajczak@mirantis.com>
 Forwarded: not-needed
-Last-Update: 2016-07-21
+Last-Update: 2016-08-16
 
 Index: neutron/requirements.txt
 ===================================================================
---- neutron.orig/requirements.txt      2016-07-21 09:54:44.000000000 +0200
-+++ neutron/requirements.txt   2016-07-21 12:05:23.196106155 +0200
+--- neutron.orig/requirements.txt      2016-08-16 18:36:34.568665027 +0200
++++ neutron/requirements.txt   2016-08-16 18:37:32.220008362 +0200
 @@ -44,8 +44,6 @@
- oslo.utils>=3.15.0 # Apache-2.0
+ oslo.utils>=3.16.0 # Apache-2.0
  oslo.versionedobjects>=1.13.0 # Apache-2.0
  osprofiler>=1.3.0 # Apache-2.0
 -ovs>=2.5.0;python_version=='2.7' # Apache-2.0
diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index bb52e829d3c5ab0e2a6ad57e072819c7e53855c5..5de86191dd166bd2f661413b22e76956403d0b5e 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -1 +1,2 @@
 fix-requirements.txt.patch
+fix-no-attribute-code.patch
\ No newline at end of file
diff --git a/xenial/debian/rules b/xenial/debian/rules
index 1cc0729f3cdcf8ae6064958af5a342bfebbf2fd5..3341eace6a4bf3e7e6f8fa9aa5da32de5f8d21b0 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -49,7 +49,7 @@ override_dh_install:
 
        # metering_agent.ini
        mkdir -p $(CURDIR)/debian/neutron-metering-agent/etc/neutron
-       PYTHONPATH=$(CURDIR)/debian/tmp oslo-config-generator --output-file $(CURDIR)/debian/neutron-metering-agent/etc/neutron/metering_agent.ini \
+       PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-metering-agent/etc/neutron/metering_agent.ini \
                --wrap-width 140 \
                --namespace neutron.metering.agent \
                --namespace oslo.log