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

Merge pull request #7121 from AlanCoding/silent_groups

Browse Source 
silence activity stream IG assignment
This commit is contained in:
Alan Rominger
2017-07-18 08:12:47 -04:00
committed by GitHub
parent 591a4be729 d02bc52ca2
commit c06d4eaa08
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/scheduler/__init__.py
View File

@@ -19,6 +19,7 @@ from awx.main.models import * # noqa
#from awx.main.scheduler.dag_simple import SimpleDAG #from awx.main.scheduler.dag_simple import SimpleDAG
from awx.main.scheduler.dag_workflow import WorkflowDAG from awx.main.scheduler.dag_workflow import WorkflowDAG
from awx.main.utils.pglock import advisory_lock from awx.main.utils.pglock import advisory_lock
from awx.main.signals import disable_activity_stream
from awx.main.scheduler.dependency_graph import DependencyGraph from awx.main.scheduler.dependency_graph import DependencyGraph
from awx.main import tasks as awx_tasks from awx.main import tasks as awx_tasks
@@ -221,9 +222,13 @@ class TaskManager():
if not task.supports_isolation() and rampart_group.controller_id: if not task.supports_isolation() and rampart_group.controller_id:
# non-Ansible jobs on isolated instances run on controller # non-Ansible jobs on isolated instances run on controller
task.instance_group = rampart_group.controller task.instance_group = rampart_group.controller
logger.debug('Submitting isolated job {} to queue {} via {}.'.format(
task.id, task.instance_group_id, rampart_group.controller_id))
else: else:
task.instance_group = rampart_group task.instance_group = rampart_group
task.save() logger.debug('Submitting job {} to instance group {}.'.format(task.id, task.instance_group_id))
with disable_activity_stream():
task.save()
self.consume_capacity(task, rampart_group.name) self.consume_capacity(task, rampart_group.name)