Merge "use retry_db_errors from neutron-lib"

lower-constraints.txt

@@ -52,7 +52,7 @@ msgpack-python==0.4.0
 munch==2.1.0
 netaddr==0.7.18
 netifaces==0.10.4
-neutron-lib==1.13.0
+neutron-lib==1.14.0
 neutron==12.0.0
 openstackdocstheme==1.18.1
 openstacksdk==0.11.2

neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py

@@ -17,12 +17,12 @@ import re
 
 import netaddr
 from neutron.common import ipv6_utils
-from neutron.db import api as db_api
 from neutron.db import common_db_mixin as base_db
 from neutron_lib.callbacks import events
 from neutron_lib.callbacks import registry
 from neutron_lib.callbacks import resources
 from neutron_lib import constants as n_const
+from neutron_lib.db import api as db_api
 from neutron_lib import exceptions as n_exc
 from neutron_lib.plugins import constants as pg_const
 from neutron_lib.plugins import directory

requirements.txt

@@ -6,7 +6,7 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
 requests>=2.14.2 # Apache-2.0
 netaddr>=0.7.18 # BSD
-neutron-lib>=1.13.0 # Apache-2.0
+neutron-lib>=1.14.0 # Apache-2.0
 neutron>=12.0.0 # Apache-2.0
 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
 alembic>=0.8.10 # MIT