From 300d54864d8405895440f23074b7ee3811af55bc Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 20 Jul 2020 14:00:24 -0400 Subject: [PATCH] Remove project update vars no longer used --- awx/main/tasks.py | 3 --- awx/playbooks/project_update.yml | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 7ff21fa85f..0f667be4c8 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -2167,9 +2167,6 @@ class RunProjectUpdate(BaseTask): 'roles_enabled': settings.AWX_ROLES_ENABLED, 'collections_enabled': settings.AWX_COLLECTIONS_ENABLED, }) - if project_update.job_type != 'check' and self.job_private_data_dir: - extra_vars['collections_destination'] = os.path.join(self.job_private_data_dir, 'requirements_collections') - extra_vars['roles_destination'] = os.path.join(self.job_private_data_dir, 'requirements_roles') # apply custom refspec from user for PR refs and the like if project_update.scm_refspec: extra_vars['scm_refspec'] = project_update.scm_refspec diff --git a/awx/playbooks/project_update.yml b/awx/playbooks/project_update.yml index 419f0531eb..64008576a6 100644 --- a/awx/playbooks/project_update.yml +++ b/awx/playbooks/project_update.yml @@ -3,7 +3,7 @@ # projects_root: Global location for caching project checkouts and roles and collections # should not have trailing slash on end # local_path: Path within projects_root to use for this project -# project_path: projects_root/local_path +# project_path: A simple join of projects_root/local_path folders # scm_url: https://server/repo # insights_url: Insights service URL (from configuration) # scm_branch: branch/tag/revision (HEAD if unset) @@ -14,8 +14,6 @@ # scm_refspec: a refspec to fetch in addition to obtaining version # roles_enabled: Value of the global setting to enable roles downloading # collections_enabled: Value of the global setting to enable collections downloading -# roles_destination: Path to save roles from galaxy to -# collections_destination: Path to save collections from galaxy to # awx_version: Current running version of the awx or tower as a string # awx_license_type: "open" for AWX; else presume Tower