From 9307e2de2616740314e6c8845e57084eb48ec2f1 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Tue, 2 Apr 2013 13:11:07 -0400 Subject: [PATCH] Notes/todos. --- lib/main/models/__init__.py | 4 ++++ lib/main/tasks.py | 3 ++- lib/plugins/callback/acom_callback.py | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/main/models/__init__.py b/lib/main/models/__init__.py index 92acf5793c..927fc431cf 100644 --- a/lib/main/models/__init__.py +++ b/lib/main/models/__init__.py @@ -403,6 +403,10 @@ class Host(CommonModelNameNotUnique): import lib.urls return reverse(lib.urls.views_HostsDetail, args=(self.pk,)) + # relationship to LaunchJobStatus + # relationship to LaunchJobStatusEvent + # last_job_status + class Group(CommonModelNameNotUnique): ''' diff --git a/lib/main/tasks.py b/lib/main/tasks.py index ea1c63249a..9953905284 100644 --- a/lib/main/tasks.py +++ b/lib/main/tasks.py @@ -45,7 +45,8 @@ def run_launch_job(launch_job_status_pk): playbook = launch_job.project.default_playbook cmdline = ['ansible-playbook', '-i', inventory_script]#, '-v'] cmdline.append(playbook) - + + # FIXME: How to cancel/interrupt job? (not that important for now) proc = subprocess.Popen(cmdline, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env) stdout, stderr = proc.communicate() diff --git a/lib/plugins/callback/acom_callback.py b/lib/plugins/callback/acom_callback.py index d5923df2b2..02ad259223 100644 --- a/lib/plugins/callback/acom_callback.py +++ b/lib/plugins/callback/acom_callback.py @@ -59,6 +59,7 @@ class CallbackModule(object): def _log_event(self, event, **event_data): #print '====', event, args, kwargs + # self.playbook.inventory if hasattr(self, 'launch_job_status'): kwargs = { 'event': event,