summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-26 23:06:43 +0000
committerGerrit Code Review <review@openstack.org>2018-11-26 23:06:43 +0000
commit04fe1101c71012d336150ef86cd6c574bb726134 (patch)
tree4a114246bc8da124b047ead95ae5ce38dcff5e2a
parent3476bb87882702b9a1ab854cc76e5cd44928301c (diff)
parentbde27fa4eca5a4ea92a0eadf6ebb32834bca719a (diff)
Merge "Include executor variables in initial setup call"
-rw-r--r--zuul/executor/server.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/zuul/executor/server.py b/zuul/executor/server.py
index 1397f0a..2f42c0f 100644
--- a/zuul/executor/server.py
+++ b/zuul/executor/server.py
@@ -1865,6 +1865,8 @@ class AnsibleJob(object):
1865 cmd = ['ansible', '*', verbose, '-m', 'setup', 1865 cmd = ['ansible', '*', verbose, '-m', 'setup',
1866 '-i', self.jobdir.setup_inventory, 1866 '-i', self.jobdir.setup_inventory,
1867 '-a', 'gather_subset=!all'] 1867 '-a', 'gather_subset=!all']
1868 if self.executor_variables_file is not None:
1869 cmd.extend(['-e@%s' % self.executor_variables_file])
1868 1870
1869 result, code = self.runAnsible( 1871 result, code = self.runAnsible(
1870 cmd=cmd, timeout=60, playbook=playbook, 1872 cmd=cmd, timeout=60, playbook=playbook,