def retry(exception, interval=1, retries=10, backoff_rate=2,
-          wait_random=False):
+          wait_random=False, max_wait=None):
     """A wrapper around retrying library.

     This decorator allows to log and to check 'retries' input param.
@@ -436,6 +436,9 @@ def retry(exception, interval=1, retries=10, backoff_rate=2,
         else:
             wait_val = wait_for * 1000.0

+        if max_wait:
+            wait_val = min(wait_for, max_wait)
+