remove unnecessary references to bwrap, bubblewrap, and proot

awx/main/tasks.py

@@ -841,7 +841,6 @@ class BaseTask(object):
     model = None
     event_model = None
     abstract = True
-    proot_show_paths = []
 
     def __init__(self):
         self.cleanup_paths = []
@@ -908,9 +907,9 @@ class BaseTask(object):
         if pull:
             params['container_options'].append(f'--pull={pull}')
 
-        if settings.AWX_PROOT_SHOW_PATHS:
+        if settings.AWX_ISOLATION_SHOW_PATHS:
             params['container_volume_mounts'] = []
-            for this_path in settings.AWX_PROOT_SHOW_PATHS:
+            for this_path in settings.AWX_ISOLATION_SHOW_PATHS:
                 params['container_volume_mounts'].append(f'{this_path}:{this_path}:Z')
         return params
 
@@ -924,7 +923,7 @@ class BaseTask(object):
         """
         Create a temporary directory for job-related files.
         """
-        pdd_wrapper_path = tempfile.mkdtemp(prefix=f'pdd_wrapper_{instance.pk}_', dir=settings.AWX_PROOT_BASE_PATH)
+        pdd_wrapper_path = tempfile.mkdtemp(prefix=f'pdd_wrapper_{instance.pk}_', dir=settings.AWX_ISOLATION_BASE_PATH)
         os.chmod(pdd_wrapper_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
         if settings.AWX_CLEANUP_PATHS:
             self.cleanup_paths.append(pdd_wrapper_path)
@@ -1090,12 +1089,6 @@ class BaseTask(object):
         """
         return False
 
-    def should_use_proot(self, instance):
-        """
-        Return whether this task should use proot.
-        """
-        return False
-
     def build_inventory(self, instance, private_data_dir):
         script_params = dict(hostvars=True, towervars=True)
         if hasattr(instance, 'job_slice_number'):
@@ -1371,8 +1364,8 @@ class BaseTask(object):
                 status = self.instance.status
                 raise RuntimeError('not starting %s task' % self.instance.status)
 
-            if not os.path.exists(settings.AWX_PROOT_BASE_PATH):
-                raise RuntimeError('AWX_PROOT_BASE_PATH=%s does not exist' % settings.AWX_PROOT_BASE_PATH)
+            if not os.path.exists(settings.AWX_ISOLATION_BASE_PATH):
+                raise RuntimeError('AWX_ISOLATION_BASE_PATH=%s does not exist' % settings.AWX_ISOLATION_BASE_PATH)
 
             # store a record of the venv used at runtime
             if hasattr(self.instance, 'custom_virtualenv'):
@@ -1598,8 +1591,7 @@ class RunJob(BaseTask):
                 env['ANSIBLE_CALLBACK_PLUGINS'] = ':'.join(settings.AWX_ANSIBLE_CALLBACK_PLUGINS)
             env['AWX_HOST'] = settings.TOWER_URL_BASE
 
-        # Create a directory for ControlPath sockets that is unique to each
-        # job and visible inside the proot environment (when enabled).
+        # Create a directory for ControlPath sockets that is unique to each job
         cp_dir = os.path.join(private_data_dir, 'cp')
         if not os.path.exists(cp_dir):
             os.mkdir(cp_dir, 0o700)
@@ -1768,14 +1760,6 @@ class RunJob(BaseTask):
         """
         return settings.AWX_RESOURCE_PROFILING_ENABLED
 
-    def should_use_proot(self, job):
-        """
-        Return whether this task should use proot.
-        """
-        if job.is_container_group_task:
-            return False
-        return getattr(settings, 'AWX_PROOT_ENABLED', False)
-
     def build_execution_environment_params(self, instance):
         if settings.IS_K8S:
             return {}
@@ -1929,10 +1913,6 @@ class RunProjectUpdate(BaseTask):
     event_model = ProjectUpdateEvent
     event_data_key = 'project_update_id'
 
-    @property
-    def proot_show_paths(self):
-        return [settings.PROJECTS_ROOT]
-
     def __init__(self, *args, job_private_data_dir=None, **kwargs):
         super(RunProjectUpdate, self).__init__(*args, **kwargs)
         self.playbook_new_revision = None
@@ -1990,7 +1970,7 @@ class RunProjectUpdate(BaseTask):
         env['DISPLAY'] = ''  # Prevent stupid password popup when running tests.
         # give ansible a hint about the intended tmpdir to work around issues
         # like https://github.com/ansible/ansible/issues/30064
-        env['TMP'] = settings.AWX_PROOT_BASE_PATH
+        env['TMP'] = settings.AWX_ISOLATION_BASE_PATH
         env['PROJECT_UPDATE_ID'] = str(project_update.pk)
         if settings.GALAXY_IGNORE_CERTS:
             env['ANSIBLE_GALAXY_IGNORE'] = True
@@ -2394,12 +2374,6 @@ class RunProjectUpdate(BaseTask):
             if status == 'successful' and instance.launch_type != 'sync':
                 self._update_dependent_inventories(instance, dependent_inventory_sources)
 
-    def should_use_proot(self, project_update):
-        """
-        Return whether this task should use proot.
-        """
-        return getattr(settings, 'AWX_PROOT_ENABLED', False)
-
     def build_execution_environment_params(self, instance):
         if settings.IS_K8S:
             return {}
@@ -2790,7 +2764,7 @@ class RunAdHocCommand(BaseTask):
         env['ANSIBLE_SFTP_BATCH_MODE'] = 'False'
 
         # Create a directory for ControlPath sockets that is unique to each
-        # ad hoc command and visible inside the proot environment (when enabled).
+        # ad hoc command
         cp_dir = os.path.join(private_data_dir, 'cp')
         if not os.path.exists(cp_dir):
             os.mkdir(cp_dir, 0o700)
@@ -2894,14 +2868,6 @@ class RunAdHocCommand(BaseTask):
         d[r'Password:\s*?$'] = 'ssh_password'
         return d
 
-    def should_use_proot(self, ad_hoc_command):
-        """
-        Return whether this task should use proot.
-        """
-        if ad_hoc_command.is_container_group_task:
-            return False
-        return getattr(settings, 'AWX_PROOT_ENABLED', False)
-
     def final_run_hook(self, adhoc_job, status, private_data_dir, fact_modification_times, isolated_manager_instance=None):
         super(RunAdHocCommand, self).final_run_hook(adhoc_job, status, private_data_dir, fact_modification_times)
         if isolated_manager_instance: