1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00

Merge pull request #7121 from AlanCoding/silent_groups

silence activity stream IG assignment
This commit is contained in:
Alan Rominger 2017-07-18 08:12:47 -04:00 committed by GitHub
commit c06d4eaa08

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_workflow import WorkflowDAG
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 import tasks as awx_tasks
@ -221,8 +222,12 @@ class TaskManager():
if not task.supports_isolation() and rampart_group.controller_id:
# non-Ansible jobs on isolated instances run on 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:
task.instance_group = rampart_group
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)