mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Error handling and magic around with_items, to let you know when variables are usable inside it and when not.
This commit is contained in:
parent
102b22be1f
commit
028f216689
1 changed files with 8 additions and 4 deletions
|
@ -63,6 +63,9 @@ class Play(object):
|
||||||
self.sudo_user = ds.get('sudo_user', self.playbook.sudo_user)
|
self.sudo_user = ds.get('sudo_user', self.playbook.sudo_user)
|
||||||
self.transport = ds.get('connection', self.playbook.transport)
|
self.transport = ds.get('connection', self.playbook.transport)
|
||||||
self.tags = ds.get('tags', None)
|
self.tags = ds.get('tags', None)
|
||||||
|
|
||||||
|
self._update_vars_files_for_host(None)
|
||||||
|
|
||||||
self._tasks = self._load_tasks(self._ds, 'tasks')
|
self._tasks = self._load_tasks(self._ds, 'tasks')
|
||||||
self._handlers = self._load_tasks(self._ds, 'handlers')
|
self._handlers = self._load_tasks(self._ds, 'handlers')
|
||||||
|
|
||||||
|
@ -75,6 +78,7 @@ class Play(object):
|
||||||
|
|
||||||
if self.sudo_user != 'root':
|
if self.sudo_user != 'root':
|
||||||
self.sudo = True
|
self.sudo = True
|
||||||
|
|
||||||
|
|
||||||
# *************************************************
|
# *************************************************
|
||||||
|
|
||||||
|
@ -104,6 +108,10 @@ class Play(object):
|
||||||
elif isinstance(items, basestring):
|
elif isinstance(items, basestring):
|
||||||
items = utils.varLookup(items, task_vars)
|
items = utils.varLookup(items, task_vars)
|
||||||
for item in items:
|
for item in items:
|
||||||
|
item = utils.template(item, task_vars)
|
||||||
|
if self._has_vars_in(item):
|
||||||
|
raise errors.AnsibleError("parse error: unbound variable in with_items: %s" % item)
|
||||||
|
|
||||||
mv = task_vars.copy()
|
mv = task_vars.copy()
|
||||||
mv['item'] = item
|
mv['item'] = item
|
||||||
results.append(Task(self,y,module_vars=mv))
|
results.append(Task(self,y,module_vars=mv))
|
||||||
|
@ -161,10 +169,6 @@ class Play(object):
|
||||||
def update_vars_files(self, hosts):
|
def update_vars_files(self, hosts):
|
||||||
''' calculate vars_files, which requires that setup runs first so ansible facts can be mixed in '''
|
''' calculate vars_files, which requires that setup runs first so ansible facts can be mixed in '''
|
||||||
|
|
||||||
# first process things that are not really host specific
|
|
||||||
# and we can just keep one reference to them
|
|
||||||
self._update_vars_files_for_host(None)
|
|
||||||
|
|
||||||
# now loop through all the hosts...
|
# now loop through all the hosts...
|
||||||
for h in hosts:
|
for h in hosts:
|
||||||
self._update_vars_files_for_host(h)
|
self._update_vars_files_for_host(h)
|
||||||
|
|
Loading…
Reference in a new issue