From 7417f9925fa8ecc14c6504988294b4a2680a3316 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Fri, 16 Nov 2018 13:28:42 -0500
Subject: [PATCH] Minor cleanup of task environment vars

---
 awx/main/tasks.py        | 5 -----
 awx/settings/defaults.py | 3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 08a6c54548..73b140c55f 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -1208,8 +1208,6 @@ class RunJob(BaseTask):
         if job.project:
             env['PROJECT_REVISION'] = job.project.scm_revision
         env['ANSIBLE_RETRY_FILES_ENABLED'] = "False"
-        env['ANSIBLE_INVENTORY_ENABLED'] = 'script'
-        env['ANSIBLE_INVENTORY_UNPARSED_FAILED'] = 'True'
         env['MAX_EVENT_RES'] = str(settings.MAX_EVENT_RES_DATA)
         if not kwargs.get('isolated'):
             env['ANSIBLE_CALLBACK_PLUGINS'] = plugin_path
@@ -1224,9 +1222,6 @@ class RunJob(BaseTask):
             os.mkdir(cp_dir, 0o700)
         env['ANSIBLE_SSH_CONTROL_PATH_DIR'] = cp_dir
 
-        # Allow the inventory script to include host variables inline via ['_meta']['hostvars'].
-        env['INVENTORY_HOSTVARS'] = str(True)
-
         # Set environment variables for cloud credentials.
         cred_files = kwargs.get('private_data_files', {}).get('credentials', {})
         for cloud_cred in job.cloud_credentials:
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 62a4c2cbcc..1e0fed8596 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -606,6 +606,9 @@ ANSIBLE_PARAMIKO_RECORD_HOST_KEYS = False
 # output
 ANSIBLE_FORCE_COLOR = True
 
+# If tmp generated inventory parsing fails (error state), fail playbook fast
+ANSIBLE_INVENTORY_UNPARSED_FAILED = True
+
 # Additional environment variables to be passed to the ansible subprocesses
 AWX_TASK_ENV = {}