shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Code Releases Activity

Disable ControlPersist for ad hoc commands, should avoid any issues with proot or needing to clean up sockets afterwards.

Browse Source
This commit is contained in:
Chris Church 2015-04-09 10:32:14 -04:00
parent 3f8ab73733
commit 8beed7f409
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/tasks.py
View File

@ -1209,12 +1209,9 @@ class RunAdHocCommand(BaseTask):
elif settings.DEBUG: elif settings.DEBUG:
env['JOB_CALLBACK_DEBUG'] = '1' env['JOB_CALLBACK_DEBUG'] = '1'
# Create a directory for ControlPath sockets that is unique to each # Specify empty SSH args (should disable ControlPersist entirely for
# ad hoc command and visible inside the proot environment (when enabled). # ad hoc commands).
cp_dir = os.path.join(kwargs['private_data_dir'], 'cp') env.setdefault('ANSIBLE_SSH_ARGS', '')
if not os.path.exists(cp_dir):
os.mkdir(cp_dir, 0700)
env['ANSIBLE_SSH_CONTROL_PATH'] = os.path.join(cp_dir, 'ansible-ssh-%%h-%%p-%%r')
return env return env

2
awx/plugins/callback/job_event_callback.py
View File

@ -458,8 +458,6 @@ class AdHocCommandCallbackModule(BaseCallbackModule):
Callback module for logging ansible ad hoc events via ZMQ or the REST API. Callback module for logging ansible ad hoc events via ZMQ or the REST API.
''' '''
# FIXME: Clean up lingering control persist sockets.
def __init__(self): def __init__(self):
self.ad_hoc_command_id = int(os.getenv('AD_HOC_COMMAND_ID', '0')) self.ad_hoc_command_id = int(os.getenv('AD_HOC_COMMAND_ID', '0'))
self.rest_api_path = '/api/v1/ad_hoc_commands/%d/events/' % self.ad_hoc_command_id self.rest_api_path = '/api/v1/ad_hoc_commands/%d/events/' % self.ad_hoc_command_id