External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 18:09:57 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3482 from chrismeyersfsu/fix-iso_ident

Browse Source 
do not generate a random ident

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-03-22 16:43:04 +00:00 committed by GitHub
commit eb5846d1be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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