External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 20:00:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

do not generate a random ident

Browse Source 
* instead, set the ident passed to ansible runner to be the job id. That
way, on we know what directory to look in for results when the directory
structure is created.
This commit is contained in:
chris meyers 2019-03-22 09:42:57 -04:00
parent 8b2fc26219
commit 87e1ba4dea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/expect/isolated_manager.py
View File

@ -4,7 +4,6 @@ import shutil
import stat
import tempfile
import time
import uuid
import logging
from io import StringIO
@ -373,7 +372,7 @@ class IsolatedManager(object):
if os.path.exists(facts_path):
shutil.rmtree(facts_path)
def run(self, instance, private_data_dir, playbook, event_data_key):
def run(self, instance, private_data_dir, playbook, event_data_key, ident=None):
"""
Run a job on an isolated host.
@ -388,7 +387,7 @@ class IsolatedManager(object):
representing the status and return code of the isolated
`ansible-playbook` run.
"""
self.ident = str(uuid.uuid4())
self.ident = ident
self.event_data_key = event_data_key
self.instance = instance
self.host = instance.execution_node

3
awx/main/tasks.py
View File

@ -1183,7 +1183,8 @@ class BaseTask(object):
status, rc = manager_instance.run(self.instance,
private_data_dir,
playbook,
event_data_key=self.event_data_key)
event_data_key=self.event_data_key,
ident=str(self.instance.pk))
else:
res = ansible_runner.interface.run(**params)
status = res.status