From 73418e41f30ae3d4cd26e6622dc439fb543f1d9c Mon Sep 17 00:00:00 2001
From: Alan Rominger <arominge@redhat.com>
Date: Thu, 3 Sep 2020 11:02:08 -0400
Subject: [PATCH] Fix pathing issue with custom credentials

also fix some minor flake8 issues
---
 awx/main/models/credential/__init__.py |  7 ++++++-
 awx/main/tasks.py                      | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/awx/main/models/credential/__init__.py b/awx/main/models/credential/__init__.py
index e8a2884083..15afd55018 100644
--- a/awx/main/models/credential/__init__.py
+++ b/awx/main/models/credential/__init__.py
@@ -564,7 +564,12 @@ class CredentialType(CommonModelNameNotUnique):
 
             if extra_vars:
                 path = build_extra_vars_file(extra_vars, private_data_dir)
-                args.extend(['-e', '@%s' % path])
+                # FIXME: develop some better means of referencing paths inside containers
+                container_path = os.path.join(
+                    '/runner',
+                    os.path.basename(path)
+                )
+                args.extend(['-e', '@%s' % container_path])
 
 
 class ManagedCredentialType(SimpleNamespace):
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index b929c231b1..dcd752f72c 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -1414,9 +1414,10 @@ class BaseTask(object):
             cwd = self.build_cwd(self.instance, private_data_dir)
             resource_profiling_params = self.build_params_resource_profiling(self.instance,
                                                                              private_data_dir)
-            process_isolation_params = self.build_params_process_isolation(self.instance,
-                                                                           private_data_dir,
-                                                                           cwd)
+            # TODO: Remove if fully replaced with containerized runs
+            # process_isolation_params = self.build_params_process_isolation(self.instance,
+            #                                                                private_data_dir,
+            #                                                                cwd)
             execution_environment_params = self.build_execution_environment_params(self.instance)
             env = self.build_env(self.instance, private_data_dir, isolated,
                                  private_data_files=private_data_files)
@@ -2534,10 +2535,9 @@ class RunInventoryUpdate(BaseTask):
         are accomplished by the inventory source injectors (in this method)
         or custom credential type injectors (in main run method).
         """
-        base_env = super(RunInventoryUpdate, self).build_env(inventory_update,
-                                                        private_data_dir,
-                                                        isolated,
-                                                        private_data_files=private_data_files)
+        base_env = super(RunInventoryUpdate, self).build_env(
+            inventory_update, private_data_dir, isolated,
+            private_data_files=private_data_files)
         # TODO: this is able to run by turning off isolation
         # the goal is to run it a container instead
         env = dict(os.environ.items())
@@ -3035,9 +3035,9 @@ class RunSystemJob(BaseTask):
         return path
 
     def build_env(self, instance, private_data_dir, isolated=False, private_data_files=None):
-        base_env = super(RunSystemJob, self).build_env(instance, private_data_dir,
-                                                  isolated=isolated,
-                                                  private_data_files=private_data_files)
+        base_env = super(RunSystemJob, self).build_env(
+            instance, private_data_dir, isolated=isolated,
+            private_data_files=private_data_files)
         # TODO: this is able to run by turning off isolation
         # the goal is to run it a container instead
         env = dict(os.environ.items())