From f0dec6d6affe7317dd2528bb06988c1eeff06e93 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sun, 9 Jun 2013 16:23:08 +0200 Subject: [PATCH] Keep TaskList inside common module --- common/__init__.py | 3 +-- common/main.py | 4 +++- providers/ec2/__init__.py | 20 ++++++++------------ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/common/__init__.py b/common/__init__.py index ca7d419..7d46658 100644 --- a/common/__init__.py +++ b/common/__init__.py @@ -1,5 +1,4 @@ -__all__ = ['Manifest', 'Task', 'TaskList', 'main'] +__all__ = ['Manifest', 'Task', 'main'] from manifest import Manifest from task import Task -from tasklist import TaskList from main import main diff --git a/common/main.py b/common/main.py index 7df8a80..4bbc73a 100644 --- a/common/main.py +++ b/common/main.py @@ -22,7 +22,9 @@ def run(args): manifest.validate() manifest.load_plugins() - tasklist = provider.tasklist(manifest) + from tasklist import TaskList + tasklist = TaskList() + provider.modify_tasklist(tasklist, manifest) tasklist.plugins(manifest) from bootstrapinfo import BootstrapInformation diff --git a/providers/ec2/__init__.py b/providers/ec2/__init__.py index 849944d..0e9b2ea 100644 --- a/providers/ec2/__init__.py +++ b/providers/ec2/__init__.py @@ -1,18 +1,14 @@ from manifest import Manifest -def tasklist(manifest): - from common import TaskList +def modify_tasklist(tasklist, manifest): from tasks import packages from tasks import ec2 from tasks import host - task_list = TaskList() - task_list.extend([packages.HostPackages(), - packages.ImagePackages(), - ec2.GetCredentials(), - host.GetInfo(), - ec2.Connect(), - host.InstallPackages() - ]) - - return task_list + tasklist.extend([packages.HostPackages(), + packages.ImagePackages(), + ec2.GetCredentials(), + host.GetInfo(), + ec2.Connect(), + host.InstallPackages() + ])