Merge remote-tracking branch 'ansible/devel' into merge-devel

awx/main/tasks.py

@@ -14,7 +14,6 @@ import pipes
 import re
 import shutil
 import stat
-import subprocess
 import tempfile
 import thread
 import time
@@ -169,30 +168,6 @@ def notify_task_runner(metadata_dict):
     queue = FifoQueue('tower_task_manager')
     queue.push(metadata_dict)
 
-@task()
-def mongodb_control(cmd):
-    # Sanity check: Do not send arbitrary commands.
-    if cmd not in ('start', 'stop'):
-        raise ValueError('Only "start" and "stop" are allowed.')
-
-    # Either start or stop mongo, as requested.
-    p = subprocess.Popen('sudo service mongod %s' % cmd, shell=True,
-                         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    out, err = p.communicate()
-    p.wait()
-
-    # Check to make sure the stop actually succeeded
-    p = subprocess.Popen('pidof mongod', shell=True)
-    shutdown_failed = p.wait() == 0
-
-    # If there was an error, log it.
-    if err:
-        logger.error(err)
-
-    if cmd == 'stop' and shutdown_failed:
-        p = subprocess.Popen('sudo mongod --shutdown -f /etc/mongod.conf', shell=True)
-        p.wait()
-
 @task(bind=True)
 def handle_work_success(self, result, task_actual):
     if task_actual['type'] == 'project_update':
@@ -215,6 +190,11 @@ def handle_work_success(self, result, task_actual):
         instance_name = instance.module_name
         notifiers = [] # TODO: Ad-hoc commands need to notify someone
         friendly_name = "AdHoc Command"
+    elif task_actual['type'] == 'system_job':
+        instance = SystemJob.objects.get(id=task_actual['id'])
+        instance_name = instance.system_job_template.name
+        notifiers = instance.system_job_template.notifiers
+        friendly_name = "System Job"
     else:
         return
     notification_body = instance.notification_data()
@@ -258,6 +238,11 @@ def handle_work_error(self, task_id, subtasks=None):
                 instance_name = instance.module_name
                 notifiers = []
                 friendly_name = "AdHoc Command"
+            elif task_actual['type'] == 'system_job':
+                instance = SystemJob.objects.get(id=task_actual['id'])
+                instance_name = instance.system_job_template.name
+                notifiers = instance.system_job_template.notifiers
+                friendly_name = "System Job"
             else:
                 # Unknown task type
                 break