Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix loop_control templating #36124

Merged
merged 2 commits into from
Feb 14, 2018
Merged

fix loop_control templating #36124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b1e6e8
fix loop_control templating
bcoca Feb 13, 2018
fa895a1
PEEEEPEEEE
bcoca Feb 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 13 additions & 8 deletions lib/ansible/executor/task_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from ansible.executor.task_result import TaskResult
from ansible.module_utils.six import iteritems, string_types, binary_type
from ansible.module_utils.six.moves import cPickle
from ansible.module_utils._text import to_text
from ansible.module_utils._text import to_text, to_native
from ansible.playbook.conditional import Conditional
from ansible.playbook.task import Task
from ansible.template import Templar
Expand Down Expand Up @@ -272,12 +272,15 @@ def _run_loop(self, items):
index_var = None
label = None
loop_pause = 0
templar = Templar(loader=self._loader, shared_loader_obj=self._shared_loader_obj, variables=self._job_vars)
if self._task.loop_control:
loop_var = self._task.loop_control.loop_var
index_var = self._task.loop_control.index_var
loop_pause = self._task.loop_control.pause
# FIXME: move this to the object itself to allow post_validate to take care of templating
loop_var = templar.template(self._task.loop_control.loop_var)
index_var = templar.template(self._task.loop_control.index_var)
loop_pause = templar.template(self._task.loop_control.pause)
# the these may be 'None', so we still need to default to something useful
label = self._task.loop_control.label or ('{{' + loop_var + '}}')
# this is tempalted below after an item is assigned
label = (self._task.loop_control.label or ('{{' + loop_var + '}}'))

if loop_var in task_vars:
display.warning(u"The loop variable '%s' is already in use. "
Expand All @@ -296,7 +299,10 @@ def _run_loop(self, items):

# pause between loop iterations
if loop_pause and ran_once:
time.sleep(loop_pause)
try:
time.sleep(float(loop_pause))
except ValueError as e:
raise AnsibleError('Invalid pause value: %s, produced error: %s' % (loop_pause, to_native(e)))
else:
ran_once = True

Expand Down Expand Up @@ -326,7 +332,6 @@ def _run_loop(self, items):
res['_ansible_ignore_errors'] = task_fields.get('ignore_errors')

if label is not None:
templar = Templar(loader=self._loader, shared_loader_obj=self._shared_loader_obj, variables=self._job_vars)
res['_ansible_item_label'] = templar.template(label)

self._rslt_q.put(
Expand Down Expand Up @@ -402,7 +407,7 @@ def _squash_items(self, items, loop_var, variables):
# * lists can be squashed together
# * dicts could squash entries that match in all cases except the
# name or pkg field.
except:
except Exception:
# Squashing is an optimization. If it fails for any reason,
# simply use the unoptimized list of items.

Expand Down
1 change: 1 addition & 0 deletions lib/ansible/playbook/loop_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from ansible.playbook.base import Base


# FIXME: loopcontrol should not inherit attributes from base, just uses it for load
class LoopControl(Base):

_loop_var = FieldAttribute(isa='str', default='item')
Expand Down