From 6230684c62f45b9a16c2b5cc8e30ebd906e18247 Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Sun, 9 Jun 2013 15:54:30 +0200
Subject: [PATCH] Refactor ec2 provider a bit

---
 common/main.py                        | 4 ++--
 plugins/admin_user/__init__.py        | 2 +-
 providers/ec2/__init__.py             | 6 +++---
 providers/ec2/tasks/__init__.py       | 0
 providers/ec2/{ => tasks}/ec2.py      | 0
 providers/ec2/{ => tasks}/host.py     | 0
 providers/ec2/{ => tasks}/packages.py | 0
 7 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 providers/ec2/tasks/__init__.py
 rename providers/ec2/{ => tasks}/ec2.py (100%)
 rename providers/ec2/{ => tasks}/host.py (100%)
 rename providers/ec2/{ => tasks}/packages.py (100%)

diff --git a/common/main.py b/common/main.py
index 9cd8cee..8a83a16 100644
--- a/common/main.py
+++ b/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()
 
diff --git a/plugins/admin_user/__init__.py b/plugins/admin_user/__init__.py
index e221b6c..b83eb05 100644
--- a/plugins/admin_user/__init__.py
+++ b/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())
diff --git a/providers/ec2/__init__.py b/providers/ec2/__init__.py
index c7d6077..849944d 100644
--- a/providers/ec2/__init__.py
+++ b/providers/ec2/__init__.py
@@ -3,9 +3,9 @@ from manifest import Manifest
 
 def tasklist(manifest):
 	from common import TaskList
-	import packages
-	import ec2
-	import host
+	from tasks import packages
+	from tasks import ec2
+	from tasks import host
 	task_list = TaskList()
 	task_list.extend([packages.HostPackages(),
 	                  packages.ImagePackages(),
diff --git a/providers/ec2/tasks/__init__.py b/providers/ec2/tasks/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/providers/ec2/ec2.py b/providers/ec2/tasks/ec2.py
similarity index 100%
rename from providers/ec2/ec2.py
rename to providers/ec2/tasks/ec2.py
diff --git a/providers/ec2/host.py b/providers/ec2/tasks/host.py
similarity index 100%
rename from providers/ec2/host.py
rename to providers/ec2/tasks/host.py
diff --git a/providers/ec2/packages.py b/providers/ec2/tasks/packages.py
similarity index 100%
rename from providers/ec2/packages.py
rename to providers/ec2/tasks/packages.py