From 1b329d10824ef17c52b809f95f9fdc248046fb96 Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Sat, 10 Aug 2013 17:20:10 +0200
Subject: [PATCH] Move host task to common tasks

---
 {providers/raw => common}/tasks/host.py |  9 ---------
 providers/ec2/__init__.py               |  3 ++-
 providers/ec2/tasks/host.py             | 18 ------------------
 providers/raw/__init__.py               |  3 +--
 4 files changed, 3 insertions(+), 30 deletions(-)
 rename {providers/raw => common}/tasks/host.py (79%)

diff --git a/providers/raw/tasks/host.py b/common/tasks/host.py
similarity index 79%
rename from providers/raw/tasks/host.py
rename to common/tasks/host.py
index 61af65a..93bafed 100644
--- a/providers/raw/tasks/host.py
+++ b/common/tasks/host.py
@@ -18,12 +18,3 @@ class CheckPackages(Task):
 			except CalledProcessError:
 				msg = "The package ``{0}\'\' is not installed".format(package)
 				raise TaskError(msg)
-
-
-class GetInfo(Task):
-	description = 'Retrieving instance metadata'
-	phase = phases.preparation
-
-	def run(self, info):
-		info.host = {}
-		return info
diff --git a/providers/ec2/__init__.py b/providers/ec2/__init__.py
index bc19ab8..e386019 100644
--- a/providers/ec2/__init__.py
+++ b/providers/ec2/__init__.py
@@ -3,6 +3,7 @@ import logging
 from tasks import packages
 from tasks import connection
 from tasks import host
+from common.tasks import host as common_host
 from tasks import ami
 from tasks import ebs
 from common.tasks import loopback
@@ -27,7 +28,7 @@ def initialize():
 def tasks(tasklist, manifest):
 	tasklist.add(packages.HostPackages(),
 	             packages.ImagePackages(),
-	             host.CheckPackages(),
+	             common_host.CheckPackages(),
 	             connection.GetCredentials(),
 	             host.GetInfo(),
 	             ami.AMIName(),
diff --git a/providers/ec2/tasks/host.py b/providers/ec2/tasks/host.py
index c7afab6..c452e0f 100644
--- a/providers/ec2/tasks/host.py
+++ b/providers/ec2/tasks/host.py
@@ -1,23 +1,5 @@
 from base import Task
 from common import phases
-from common.exceptions import TaskError
-import packages
-
-
-class CheckPackages(Task):
-	description = 'Checking installed host packages'
-	phase = phases.preparation
-	after = [packages.HostPackages, packages.ImagePackages]
-
-	def run(self, info):
-		from common.tools import log_check_call
-		from subprocess import CalledProcessError
-		for package in info.host_packages:
-			try:
-				log_check_call(['/usr/bin/dpkg', '-s', package])
-			except CalledProcessError:
-				msg = "The package ``{0}\'\' is not installed".format(package)
-				raise TaskError(msg)
 
 
 class GetInfo(Task):
diff --git a/providers/raw/__init__.py b/providers/raw/__init__.py
index eee4fa3..f9eba6e 100644
--- a/providers/raw/__init__.py
+++ b/providers/raw/__init__.py
@@ -20,8 +20,7 @@ def initialize():
 def tasks(tasklist, manifest):
 	tasklist.add(packages.HostPackages(),
 	             packages.ImagePackages(),
-	             host.CheckPackages(),
-	             host.GetInfo())
+	             host.CheckPackages())
 	tasklist.add(filesystem.FormatVolume())
 	if manifest.volume['filesystem'].lower() == 'xfs':
 		tasklist.add(filesystem.AddXFSProgs())