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

Improve the behavior of EE resolution for ad hoc commands

Browse Source 
- call resolve_execution_environment during AdHocCommand.save()
- wrap the fallback call of the resolver in tasks.py in disable_activity_stream()
This commit is contained in:
Jeff Bradberry
2020-12-11 10:09:27 -05:00
committed by Shane McDonald
parent 12b8349e88
commit 9964ba7c9a
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/models/ad_hoc_commands.py
View File

@@ -209,6 +209,9 @@ class AdHocCommand(UnifiedJob, JobNotificationMixin):
self.name = Truncator(u': '.join(filter(None, (self.module_name, self.module_args)))).chars(512) self.name = Truncator(u': '.join(filter(None, (self.module_name, self.module_args)))).chars(512)
if 'name' not in update_fields: if 'name' not in update_fields:
update_fields.append('name') update_fields.append('name')
if not self.execution_environment_id:
self.execution_environment = self.resolve_execution_environment()
update_fields.append('execution_environment')
super(AdHocCommand, self).save(*args, **kwargs) super(AdHocCommand, self).save(*args, **kwargs)
@property @property

7
awx/main/tasks.py
View File

@@ -888,8 +888,11 @@ class BaseTask(object):
def build_execution_environment_params(self, instance): def build_execution_environment_params(self, instance):
if instance.execution_environment_id is None: if instance.execution_environment_id is None:
self.instance = instance = self.update_model( from awx.main.signals import disable_activity_stream
instance.pk, execution_environment=instance.resolve_execution_environment())
with disable_activity_stream():
self.instance = instance = self.update_model(
instance.pk, execution_environment=instance.resolve_execution_environment())
image = instance.execution_environment.image image = instance.execution_environment.image
params = { params = {