Refactor ec2 provider a bit

common/main.py

@@ -15,10 +15,10 @@ def main():
 def run(args):
 	from manifest import load_manifest
 	from manifest import get_provider
-	data = load_manifest(args.manifest)
+	data     = load_manifest(args.manifest)
 	provider = get_provider(data)
-
 	manifest = provider.Manifest(args.manifest, data)
+	
 	manifest.validate()
 	manifest.load_plugins()
 

plugins/admin_user/__init__.py

@@ -1,6 +1,6 @@
 
 
 def modify_tasklist(tasklist, manifest):
-	from providers.ec2.packages import ImagePackages
+	from providers.ec2.tasks.packages import ImagePackages
 	from adminuser import AddSudoPackage
 	tasklist.after(ImagePackages, AddSudoPackage())

providers/ec2/__init__.py

@@ -3,9 +3,9 @@ from manifest import Manifest
 
 def tasklist(manifest):
 	from common import TaskList
-	import packages
+	from tasks import packages
-	import ec2
+	from tasks import ec2
-	import host
+	from tasks import host
 	task_list = TaskList()
 	task_list.extend([packages.HostPackages(),
 	                  packages.ImagePackages(),