kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 07:26:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix import errors, again.

Browse source 
(A rebase swallowed a commit somewhere)
This commit is contained in:
Anders Ingemann 2014-05-03 17:04:37 +02:00
parent 7e944cb243
commit e68ed9b66c
5 changed files with 21 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrapvz/providers/azure/__init__.py
View file

@ -2,13 +2,9 @@ from bootstrapvz.common import task_groups
import tasks.packages import tasks.packages
import tasks.boot import tasks.boot
import tasks.image import tasks.image
from bootstrapvz.common.tasks import volume
from bootstrapvz.common.tasks import loopback from bootstrapvz.common.tasks import loopback
from bootstrapvz.common.tasks import partitioning
from bootstrapvz.common.tasks import filesystem
from bootstrapvz.common.tasks import initd from bootstrapvz.common.tasks import initd
from bootstrapvz.common.tasks import ssh from bootstrapvz.common.tasks import ssh
from bootstrapvz.common.tasks import workspace
def initialize(): def initialize():

2
bootstrapvz/providers/ec2/__init__.py
View file

@ -12,9 +12,7 @@ from bootstrapvz.common.tasks import volume
from bootstrapvz.common.tasks import filesystem from bootstrapvz.common.tasks import filesystem
from bootstrapvz.common.tasks import boot from bootstrapvz.common.tasks import boot
from bootstrapvz.common.tasks import initd from bootstrapvz.common.tasks import initd
from bootstrapvz.common.tasks import partitioning
from bootstrapvz.common.tasks import loopback from bootstrapvz.common.tasks import loopback
from bootstrapvz.common.tasks import workspace
def initialize(): def initialize():

15
bootstrapvz/providers/gce/__init__.py
View file

@ -1,4 +1,4 @@
import bootstrapvz.common.task_groups from bootstrapvz.common import task_groups
import tasks.apt import tasks.apt
import tasks.boot import tasks.boot
import tasks.configuration import tasks.configuration
@ -7,7 +7,6 @@ import tasks.host
import tasks.packages import tasks.packages
from bootstrapvz.common.tasks import loopback from bootstrapvz.common.tasks import loopback
from bootstrapvz.common.tasks import ssh from bootstrapvz.common.tasks import ssh
from bootstrapvz.common.tasks import initd
import bootstrapvz.plugins.cloud_init.tasks import bootstrapvz.plugins.cloud_init.tasks
@ -21,10 +20,10 @@ def validate_manifest(data, validator, error):
validator(data, schema_path) validator(data, schema_path)
def resolve_tasks(tasklist, manifest): def resolve_tasks(taskset, manifest):
tasklist.update(bootstrapvz.common.task_groups.get_standard_groups(manifest)) taskset.update(task_groups.get_standard_groups(manifest))
tasklist.update([bootstrapvz.plugins.cloud_init.tasks.AddBackports, taskset.update([bootstrapvz.plugins.cloud_init.tasks.AddBackports,
loopback.Create, loopback.Create,
tasks.apt.SetPackageRepositories, tasks.apt.SetPackageRepositories,
tasks.apt.ImportGoogleKey, tasks.apt.ImportGoogleKey,
@ -44,10 +43,10 @@ def resolve_tasks(tasklist, manifest):
]) ])
if 'gcs_destination' in manifest.image: if 'gcs_destination' in manifest.image:
tasklist.add(tasks.image.UploadImage) taskset.add(tasks.image.UploadImage)
if 'gce_project' in manifest.image: if 'gce_project' in manifest.image:
tasklist.add(tasks.image.RegisterImage) taskset.add(tasks.image.RegisterImage)
def resolve_rollback_tasks(tasklist, manifest, completed, counter_task): def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
taskset.update(task_groups.get_standard_rollback_tasks(completed)) taskset.update(task_groups.get_standard_rollback_tasks(completed))

4
bootstrapvz/providers/kvm/__init__.py
View file

@ -1,12 +1,8 @@
from bootstrapvz.common import task_groups from bootstrapvz.common import task_groups
import tasks.packages import tasks.packages
from bootstrapvz.common.tasks import volume
from bootstrapvz.common.tasks import loopback from bootstrapvz.common.tasks import loopback
from bootstrapvz.common.tasks import partitioning
from bootstrapvz.common.tasks import filesystem
from bootstrapvz.common.tasks import initd from bootstrapvz.common.tasks import initd
from bootstrapvz.common.tasks import ssh from bootstrapvz.common.tasks import ssh
from bootstrapvz.common.tasks import workspace
def initialize(): def initialize():

4
bootstrapvz/providers/virtualbox/__init__.py
View file

@ -1,10 +1,6 @@
from bootstrapvz.common import task_groups from bootstrapvz.common import task_groups
import tasks.packages import tasks.packages
from bootstrapvz.common.tasks import volume
from bootstrapvz.common.tasks import loopback from bootstrapvz.common.tasks import loopback
from bootstrapvz.common.tasks import partitioning
from bootstrapvz.common.tasks import filesystem
from bootstrapvz.common.tasks import workspace
def initialize(): def initialize():