Merge "Replace retrying with tenacity"

mistral/coordination.py

@@ -18,7 +18,7 @@ from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_log import log
 from oslo_service import threadgroup
-from retrying import retry
+import tenacity
 import tooz.coordination
 
 from mistral import utils
@@ -95,7 +95,7 @@ class ServiceCoordinator(object):
 
             self._started = False
 
-    @retry(stop_max_attempt_number=5)
+    @tenacity.retry(stop=tenacity.stop_after_attempt(5))
     def join_group(self, group_id):
         if not self.is_active() or not group_id:
             return

requirements.txt

@@ -47,7 +47,7 @@ python-ironic-inspector-client>=1.5.0 # Apache-2.0
 python-zaqarclient>=1.0.0 # Apache-2.0
 PyYAML>=3.10.0 # MIT
 requests>=2.10.0 # Apache-2.0
-retrying!=1.3.0,>=1.2.3 # Apache-2.0
+tenacity>=3.2.1  # Apache-2.0
 setuptools!=24.0.0,>=16.0 # PSF/ZPL
 six>=1.9.0 # MIT
 SQLAlchemy<1.1.0,>=1.0.10 # MIT