From a79c53bb1742f6ef6856652dc3577b1c547e3163 Mon Sep 17 00:00:00 2001
From: Matthew Jones <mat@matburt.net>
Date: Thu, 12 May 2016 15:33:58 -0400
Subject: [PATCH] Switch to disabling sftp batch instead of scp

For ad-hoc jobs where we are experiencing issues related to disabling
control persist to support proot.  See commit
f69846e7871cae41b19ecda33563d6365dc9c3e0 for earlier analysis
---
 awx/main/tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 218eca9495..50ba05a2e5 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -1541,7 +1541,7 @@ class RunAdHocCommand(BaseTask):
         env['REST_API_URL'] = settings.INTERNAL_API_URL
         env['REST_API_TOKEN'] = ad_hoc_command.task_auth_token or ''
         env['CALLBACK_CONSUMER_PORT'] = str(settings.CALLBACK_CONSUMER_PORT)
-        env['ANSIBLE_SCP_IF_SSH'] = "True"
+        env['ANSIBLE_SFTP_BATCH_MODE'] = 'False'
         if getattr(settings, 'JOB_CALLBACK_DEBUG', False):
             env['JOB_CALLBACK_DEBUG'] = '2'
         elif settings.DEBUG: