cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #4572 Run until loop if until is set, ignoring result failures

Browse source
This commit is contained in:
James Tanner 2013-10-28 12:56:46 -04:00
parent ff8e02fb5d
commit 9249cf578d
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/runner/__init__.py
View file

@ -655,7 +655,7 @@ class Runner(object):
result = handler.run(conn, tmp, module_name, module_args, inject, complex_args) result = handler.run(conn, tmp, module_name, module_args, inject, complex_args)
# Code for do until feature # Code for do until feature
until = self.module_vars.get('until', None) until = self.module_vars.get('until', None)
if until is not None and result.comm_ok and "failed" not in result.result: if until is not None and result.comm_ok:
inject[self.module_vars.get('register')] = result.result inject[self.module_vars.get('register')] = result.result
cond = template.template(self.basedir, until, inject, expand_lists=False) cond = template.template(self.basedir, until, inject, expand_lists=False)
if not utils.check_conditional(cond, self.basedir, inject, fail_on_undefined=self.error_on_undefined_vars): if not utils.check_conditional(cond, self.basedir, inject, fail_on_undefined=self.error_on_undefined_vars):
@ -669,8 +669,6 @@ class Runner(object):
result = handler.run(conn, tmp, module_name, module_args, inject, complex_args) result = handler.run(conn, tmp, module_name, module_args, inject, complex_args)
result.result['attempts'] = x result.result['attempts'] = x
vv("Result from run %i is: %s" % (x, result.result)) vv("Result from run %i is: %s" % (x, result.result))
if "failed" in result.result:
break
inject[self.module_vars.get('register')] = result.result inject[self.module_vars.get('register')] = result.result
cond = template.template(self.basedir, until, inject, expand_lists=False) cond = template.template(self.basedir, until, inject, expand_lists=False)
if utils.check_conditional(cond, self.basedir, inject, fail_on_undefined=self.error_on_undefined_vars): if utils.check_conditional(cond, self.basedir, inject, fail_on_undefined=self.error_on_undefined_vars):