Merge "Include executor variables in initial setup call"
This commit is contained in:
commit
04fe1101c7
@ -1865,6 +1865,8 @@ class AnsibleJob(object):
|
|||||||
cmd = ['ansible', '*', verbose, '-m', 'setup',
|
cmd = ['ansible', '*', verbose, '-m', 'setup',
|
||||||
'-i', self.jobdir.setup_inventory,
|
'-i', self.jobdir.setup_inventory,
|
||||||
'-a', 'gather_subset=!all']
|
'-a', 'gather_subset=!all']
|
||||||
|
if self.executor_variables_file is not None:
|
||||||
|
cmd.extend(['-e@%s' % self.executor_variables_file])
|
||||||
|
|
||||||
result, code = self.runAnsible(
|
result, code = self.runAnsible(
|
||||||
cmd=cmd, timeout=60, playbook=playbook,
|
cmd=cmd, timeout=60, playbook=playbook,
|
||||||
|
Loading…
Reference in New Issue
Block a user