From a1877b22130a2f2ee94bf5bfb40b84f24a93336f Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Thu, 3 Jan 2013 23:01:04 +0100 Subject: [PATCH] Allow infinite depth task includes --- lib/ansible/playbook/play.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index dcb01e4e90..90e58b2efa 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -82,8 +82,8 @@ class Play(object): self._update_vars_files_for_host(None) - self._tasks = self._load_tasks(self._ds, 'tasks') - self._handlers = self._load_tasks(self._ds, 'handlers') + self._tasks = self._load_tasks(self._ds.get('tasks', [])) + self._handlers = self._load_tasks(self._ds.get('handlers', [])) if self.tags is None: self.tags = [] @@ -97,14 +97,14 @@ class Play(object): # ************************************************* - def _load_tasks(self, ds, keyname): + def _load_tasks(self, tasks, vars={}): ''' handle task and handler include statements ''' - tasks = ds.get(keyname, []) results = [] for x in tasks: + task_vars = self.vars.copy() + task_vars.update(vars) if 'include' in x: - task_vars = self.vars.copy() tokens = shlex.split(x['include']) items = [''] for k in x: @@ -124,10 +124,8 @@ class Play(object): mv[k] = utils.template_ds(self.basedir, v, mv) include_file = utils.template(self.basedir, tokens[0], mv) data = utils.parse_yaml_from_file(utils.path_dwim(self.basedir, include_file)) - for y in data: - results.append(Task(self,y,module_vars=mv.copy())) + results += self._load_tasks(data, mv) elif type(x) == dict: - task_vars = self.vars.copy() results.append(Task(self,x,module_vars=task_vars)) else: raise Exception("unexpected task type")