Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : skvidal-backend
---------------------------------------------------------------
commit 3ab66097ae55f9898010c625834c0a67e61a7676
Author: Seth Vidal <skvidal(a)fedoraproject.org>
Date: Fri Nov 30 11:44:28 2012 -0500
pass the ip of our builder over to terminate()
---------------------------------------------------------------
backend/dispatcher.py | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/backend/dispatcher.py b/backend/dispatcher.py
index a5349e6..286cffd 100644
--- a/backend/dispatcher.py
+++ b/backend/dispatcher.py
@@ -125,14 +125,14 @@ class Worker(multiprocessing.Process):
return i
return None
- def terminate_instance(self):
+ def terminate_instance(self,ip):
"""call the terminate playbook to destroy the building
instance"""
self.callback.log('terminate instance begin')
stats = callbacks.AggregateStats()
playbook_cb = SilentPlaybookCallbacks(verbose=False)
runner_cb = callbacks.DefaultRunnerCallbacks()
- play = ansible.playbook.PlayBook(host_list=[self.ip], stats=stats,
playbook=self.opts.terminate_playbook,
+ play = ansible.playbook.PlayBook(host_list=[ip], stats=stats,
playbook=self.opts.terminate_playbook,
callbacks=playbook_cb, runner_callbacks=runner_cb,
remote_user='root')
@@ -187,7 +187,6 @@ class Worker(multiprocessing.Process):
ip = self.spawn_instance()
if not ip:
raise errors.CoprWorkerError, "No IP found from creating
instance"
- self.ip = ip
except ansible.errors.AnsibleError, e:
self.callback.log('failure to setup instance: %s' % e)
@@ -224,5 +223,5 @@ class Worker(multiprocessing.Process):
self.return_results(job)
self.callback.log('worker finished build: %s' % ip)
# clean up the instance
- self.terminate_instance()
+ self.terminate_instance(ip)