diff --git a/base/main.py b/base/main.py index 32b9aba..9c84ed1 100644 --- a/base/main.py +++ b/base/main.py @@ -29,9 +29,9 @@ def run(args): from tasklist import TaskList tasklist = TaskList() - provider.tasks(tasklist, manifest) + provider.resolve_tasks(tasklist, manifest) for plugin in manifest.loaded_plugins: - plugin.tasks(tasklist, manifest) + plugin.resolve_tasks(tasklist, manifest) from bootstrapinfo import BootstrapInformation bootstrap_info = BootstrapInformation(manifest=manifest, debug=args.debug) @@ -45,10 +45,10 @@ def run(args): raw_input("Press Enter to commence rollback") log.error('Rolling back') rollback_tasklist = TaskList() - provider.rollback_tasks(rollback_tasklist, tasklist.tasks_completed, manifest) + provider.resolve_rollback_tasks(rollback_tasklist, tasklist.tasks_completed, manifest) for plugin in manifest.loaded_plugins: - rollback_tasks = getattr(plugin, 'rollback_tasks', None) - if callable(rollback_tasks): - plugin.rollback_tasks(rollback_tasklist, tasklist.tasks_completed, manifest) + resolve_rollback_tasks = getattr(plugin, 'resolve_rollback_tasks', None) + if callable(resolve_rollback_tasks): + resolve_rollback_tasks(rollback_tasklist, tasklist.tasks_completed, manifest) rollback_tasklist.run(info=bootstrap_info, dry_run=args.dry_run) log.info('Successfully completed rollback') diff --git a/plugins/admin_user/__init__.py b/plugins/admin_user/__init__.py index 5af49c3..44ff246 100644 --- a/plugins/admin_user/__init__.py +++ b/plugins/admin_user/__init__.py @@ -6,7 +6,7 @@ def validate_manifest(data, schema_validate): schema_validate(data, schema_path) -def tasks(tasklist, manifest): +def resolve_tasks(tasklist, manifest): import tasks tasklist.add(tasks.AddSudoPackage, tasks.CreateAdminUser, diff --git a/plugins/build_metadata/__init__.py b/plugins/build_metadata/__init__.py index 994b31b..ffd983a 100644 --- a/plugins/build_metadata/__init__.py +++ b/plugins/build_metadata/__init__.py @@ -1,5 +1,5 @@ -def tasks(tasklist, manifest): +def resolve_tasks(tasklist, manifest): from tasks import WriteMetadata tasklist.add(WriteMetadata) diff --git a/plugins/cloud_init/__init__.py b/plugins/cloud_init/__init__.py index c058ec7..ad9d973 100644 --- a/plugins/cloud_init/__init__.py +++ b/plugins/cloud_init/__init__.py @@ -20,7 +20,7 @@ def validate_manifest(data, schema_validate): raise ManifestError('The cloud-init package must be installed for the cloud_init plugin to work') -def tasks(tasklist, manifest): +def resolve_tasks(tasklist, manifest): from tasks import SetUsername from providers.ec2.tasks.initd import AddEC2InitScripts from common.tasks import initd diff --git a/plugins/image_commands/__init__.py b/plugins/image_commands/__init__.py index 8a9f189..34bb534 100644 --- a/plugins/image_commands/__init__.py +++ b/plugins/image_commands/__init__.py @@ -6,6 +6,6 @@ def validate_manifest(data, schema_validate): schema_validate(data, schema_path) -def tasks(tasklist, manifest): +def resolve_tasks(tasklist, manifest): from image_commands import ImageExecuteCommand tasklist.add(ImageExecuteCommand) diff --git a/plugins/opennebula/__init__.py b/plugins/opennebula/__init__.py index 6ffcec9..664b8aa 100644 --- a/plugins/opennebula/__init__.py +++ b/plugins/opennebula/__init__.py @@ -1,5 +1,5 @@ -def tasks(tasklist, manifest): +def resolve_tasks(tasklist, manifest): import tasks tasklist.add(tasks.OpenNebulaContext) diff --git a/plugins/packages/__init__.py b/plugins/packages/__init__.py index 4134737..db6e5cc 100644 --- a/plugins/packages/__init__.py +++ b/plugins/packages/__init__.py @@ -6,7 +6,7 @@ def validate_manifest(data, schema_validate): schema_validate(data, schema_path) -def tasks(tasklist, manifest): +def resolve_tasks(tasklist, manifest): from tasks import AptSources, InstallRemotePackages, InstallLocalPackages packages = manifest.plugins['packages'] if 'sources' in packages: diff --git a/plugins/prebootstrapped/__init__.py b/plugins/prebootstrapped/__init__.py index f46a93e..abcdd8e 100644 --- a/plugins/prebootstrapped/__init__.py +++ b/plugins/prebootstrapped/__init__.py @@ -16,7 +16,7 @@ def validate_manifest(data, schema_validate): schema_validate(data, schema_path) -def tasks(tasklist, manifest): +def resolve_tasks(tasklist, manifest): settings = manifest.plugins['prebootstrapped'] skip_tasks = [ebs.Create, loopback.Create, @@ -42,7 +42,7 @@ def tasks(tasklist, manifest): tasklist.add(CopyImage) -def rollback_tasks(tasklist, tasks_completed, manifest): +def resolve_rollback_tasks(tasklist, tasks_completed, manifest): completed = [type(task) for task in tasks_completed] def counter_task(task, counter): diff --git a/plugins/root_password/__init__.py b/plugins/root_password/__init__.py index b65c76b..73ccf38 100644 --- a/plugins/root_password/__init__.py +++ b/plugins/root_password/__init__.py @@ -6,7 +6,7 @@ def validate_manifest(data, schema_validate): schema_validate(data, schema_path) -def tasks(tasklist, manifest): +def resolve_tasks(tasklist, manifest): from common.tasks.security import DisableSSHPasswordAuthentication from tasks import SetRootPassword tasklist.remove(DisableSSHPasswordAuthentication) diff --git a/plugins/unattended_upgrades/__init__.py b/plugins/unattended_upgrades/__init__.py index bb87e60..87a6107 100644 --- a/plugins/unattended_upgrades/__init__.py +++ b/plugins/unattended_upgrades/__init__.py @@ -6,7 +6,7 @@ def validate_manifest(data, schema_validate): schema_validate(data, schema_path) -def tasks(tasklist, manifest): +def resolve_tasks(tasklist, manifest): import tasks tasklist.add(tasks.AddUnattendedUpgradesPackage, tasks.EnablePeriodicUpgrades) diff --git a/providers/ec2/__init__.py b/providers/ec2/__init__.py index 9f31758..9dae360 100644 --- a/providers/ec2/__init__.py +++ b/providers/ec2/__init__.py @@ -27,7 +27,7 @@ def initialize(): logging.getLogger('boto').setLevel(logging.INFO) -def tasks(tasklist, manifest): +def resolve_tasks(tasklist, manifest): from common.task_sets import base_set from common.task_sets import mounting_set from common.task_sets import apt_set @@ -98,7 +98,7 @@ def tasks(tasklist, manifest): tasklist.add(*boot_partition_set) -def rollback_tasks(tasklist, tasks_completed, manifest): +def resolve_rollback_tasks(tasklist, tasks_completed, manifest): completed = [type(task) for task in tasks_completed] def counter_task(task, counter): diff --git a/providers/virtualbox/__init__.py b/providers/virtualbox/__init__.py index afc0600..d14a888 100644 --- a/providers/virtualbox/__init__.py +++ b/providers/virtualbox/__init__.py @@ -17,7 +17,7 @@ def initialize(): pass -def tasks(tasklist, manifest): +def resolve_tasks(tasklist, manifest): from common.task_sets import base_set from common.task_sets import volume_set from common.task_sets import mounting_set @@ -62,7 +62,7 @@ def tasks(tasklist, manifest): tasklist.add(*boot_partition_set) -def rollback_tasks(tasklist, tasks_completed, manifest): +def resolve_rollback_tasks(tasklist, tasks_completed, manifest): completed = [type(task) for task in tasks_completed] def counter_task(task, counter):