Fix retries decorator, fix queens key_manager section
This patch fixes retries decorator in cinderng module.
Also fix rendering issues around barbican in config.
Change-Id: I8890ffd2eff124c5b0f38167e14292393561636b
diff --git a/_modules/cinderng.py b/_modules/cinderng.py
index d97c5cd..aaed6fd 100644
--- a/_modules/cinderng.py
+++ b/_modules/cinderng.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import logging
import time
+import functools
LOG = logging.getLogger(__name__)
@@ -47,20 +48,19 @@
return credentials
def retries(func):
+ @functools.wraps(func)
def func_wrapper(*args, **kwargs):
retries = kwargs.get('retries', 5)
timeout = kwargs.get('timeout', 5)
res = None
for i in range(retries):
try:
- res = func(*args, **kwargs)
+ return func(*args, **kwargs)
except Exception as e:
if i == retries - 1:
raise e
- time.sleep(timeout)
else:
- break
- return res
+ time.sleep(timeout)
return func_wrapper
def create_conn(cred=None):