External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-20 22:18:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Initial minimal hooking up of JT EEs to jobs

Browse Source
This commit is contained in:
Alan Rominger 2020-09-09 09:05:23 -04:00 committed by Shane McDonald
parent 332c802317
commit 9d806ddb82
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/jobs.py
View File

@ -284,7 +284,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
def _get_unified_job_field_names(cls):
return set(f.name for f in JobOptions._meta.fields) | set(
['name', 'description', 'organization', 'survey_passwords', 'labels', 'credentials',
'job_slice_number', 'job_slice_count']
'job_slice_number', 'job_slice_count', 'execution_environment']
)
@property

37
awx/main/tasks.py
View File

@ -887,7 +887,18 @@ class BaseTask(object):
return os.path.abspath(os.path.join(os.path.dirname(__file__), *args))
def build_execution_environment_params(self, instance):
params = {}
if getattr(instance, 'execution_environment', None):
# TODO: process heirarchy, JT-project-org, maybe here
# or maybe in create_unified_job
logger.info('using custom image {}'.format(instance.execution_environment.image))
image = instance.execution_environment.image
else:
logger.info('using default image')
image = settings.AWX_EXECUTION_ENVIRONMENT_DEFAULT_IMAGE
params = {
"container_image": image,
"process_isolation": True
}
if settings.AWX_PROOT_SHOW_PATHS:
params['container_volume_mounts'] = []
for this_path in settings.AWX_PROOT_SHOW_PATHS:
@ -1998,15 +2009,6 @@ class RunJob(BaseTask):
if inventory is not None:
update_inventory_computed_fields.delay(inventory.id)
def build_execution_environment_params(self, instance):
params = super(RunJob, self).build_execution_environment_params(instance)
params.update({
"container_image": settings.AWX_EXECUTION_ENVIRONMENT_DEFAULT_IMAGE,
"process_isolation": True
})
return params
@task(queue=get_local_queuename)
class RunProjectUpdate(BaseTask):
@ -2495,8 +2497,6 @@ class RunProjectUpdate(BaseTask):
params = super(RunProjectUpdate, self).build_execution_environment_params(instance)
project_path = instance.get_project_path(check_if_exists=False)
cache_path = instance.get_cache_path()
params['process_isolation'] = True
params['container_image'] = settings.AWX_EXECUTION_ENVIRONMENT_DEFAULT_IMAGE
params.setdefault('container_volume_mounts', [])
params['container_volume_mounts'].extend([
f"{project_path}:{project_path}:Z",
@ -2531,6 +2531,9 @@ class RunInventoryUpdate(BaseTask):
injector = InventorySource.injectors[inventory_update.source]()
return injector.build_private_data(inventory_update, private_data_dir)
def build_execution_environment_params(self, inventory_update):
return {} # TODO: containerize inventory updates
def build_env(self, inventory_update, private_data_dir, isolated, private_data_files=None):
"""Build environment dictionary for ansible-inventory.
@ -2992,13 +2995,6 @@ class RunAdHocCommand(BaseTask):
if isolated_manager_instance:
isolated_manager_instance.cleanup()
def build_execution_environment_params(self, instance):
execution_environment_params = {
"container_image": settings.AWX_EXECUTION_ENVIRONMENT_DEFAULT_IMAGE,
"process_isolation": True
}
return execution_environment_params
@task(queue=get_local_queuename)
class RunSystemJob(BaseTask):
@ -3007,6 +3003,9 @@ class RunSystemJob(BaseTask):
event_model = SystemJobEvent
event_data_key = 'system_job_id'
def build_execution_environment_params(self, system_job):
return {}
def build_args(self, system_job, private_data_dir, passwords):
args = ['awx-manage', system_job.job_type]
try: