openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Make throttle optional"

This commit is contained in:
Zuul 2020-06-08 16:55:55 +00:00 committed by Gerrit Code Review
parent bfb7b649cd ee3c9c841e
commit 41f132edb5
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tripleo_ansible/ansible_plugins/strategy/tripleo_free.py
View File

@ -163,14 +163,17 @@ class StrategyModule(BASE.TripleoBase):
task_vars = self._variable_manager.get_vars(**vars_params)
templar = Templar(loader=self._loader, variables=task_vars)
try:
throttle = int(templar.template(task.throttle))
except Exception as e:
raise AnsibleError("Failed to throttle: {}".format(e),
obj=task._df,
orig_exc=e)
if self._check_throttle(throttle, task):
raise TripleoFreeBreak()
# if task has a throttle attribute, check throttle e.g. ansible > 2.9
throttle = getattr(task, 'throttle', None)
if throttle is not None:
try:
throttle = int(templar.template(throttle))
except Exception as e:
raise AnsibleError("Failed to throttle: {}".format(e),
obj=task._df,
orig_exc=e)
if self._check_throttle(throttle, task):
raise TripleoFreeBreak()
# _blocked_hosts is used in the base strategy to keep track of hosts in
# that have tasks in queue