External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 06:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Pass --delete flag to worker for execution node cleanup (#11078)

Browse Source 
* Pass --delete flag to worker for execution node cleanup

* Remove the pdd_wrapper_ directory
This commit is contained in:
Alan Rominger
2021-09-16 11:21:41 -04:00
committed by GitHub
parent c1587b25b8
commit e914c23c42
1 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
awx/main/tasks.py
View File

@@ -976,13 +976,10 @@ class BaseTask(object):
""" """
Create a temporary directory for job-related files. Create a temporary directory for job-related files.
""" """
pdd_wrapper_path = tempfile.mkdtemp(prefix=f'pdd_wrapper_{instance.pk}_', dir=settings.AWX_ISOLATION_BASE_PATH) path = tempfile.mkdtemp(prefix='awx_%s_' % 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)
path = tempfile.mkdtemp(prefix='awx_%s_' % instance.pk, dir=pdd_wrapper_path)
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR) os.chmod(path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
if settings.AWX_CLEANUP_PATHS:
self.cleanup_paths.append(path)
# Ansible runner requires that project exists, # Ansible runner requires that project exists,
# and we will write files in the other folders without pre-creating the folder # and we will write files in the other folders without pre-creating the folder
for subfolder in ('project', 'inventory', 'env'): for subfolder in ('project', 'inventory', 'env'):
@@ -1108,30 +1105,6 @@ class BaseTask(object):
if self.instance.execution_environment is None: if self.instance.execution_environment is None:
raise RuntimeError('The project could not sync because there is no Execution Environment.') raise RuntimeError('The project could not sync because there is no Execution Environment.')
ee_cred = self.instance.execution_environment.credential
if ee_cred:
verify_ssl = ee_cred.get_input('verify_ssl')
if not verify_ssl:
pdd_wrapper_path = os.path.split(private_data_dir)[0]
registries_conf_path = os.path.join(pdd_wrapper_path, 'registries.conf')
host = ee_cred.get_input('host')
with open(registries_conf_path, 'w') as registries_conf:
os.chmod(registries_conf.name, stat.S_IRUSR | stat.S_IWUSR)
lines = [
'[[registry]]',
'location = "{}"'.format(host),
'insecure = true',
]
registries_conf.write('\n'.join(lines))
# Podman >= 3.1.0
env['CONTAINERS_REGISTRIES_CONF'] = registries_conf_path
# Podman < 3.1.0
env['REGISTRIES_CONFIG_PATH'] = registries_conf_path
return env return env
def build_inventory(self, instance, private_data_dir): def build_inventory(self, instance, private_data_dir):
@@ -3173,7 +3146,13 @@ class AWXReceptorJob:
receptor_params["secret_kube_config"] = kubeconfig_yaml receptor_params["secret_kube_config"] = kubeconfig_yaml
else: else:
private_data_dir = self.runner_params['private_data_dir'] private_data_dir = self.runner_params['private_data_dir']
receptor_params = {"params": f"--private-data-dir={private_data_dir}"} if self.work_type == 'ansible-runner':
# on execution nodes, we rely on the private data dir being deleted
cli_params = f"--private-data-dir={private_data_dir} --delete"
else:
# on hybrid nodes, we rely on the private data dir NOT being deleted
cli_params = f"--private-data-dir={private_data_dir}"
receptor_params = {"params": cli_params}
return receptor_params return receptor_params