From a40c639c3c56c1d6c82162ba7130cc92c7ed403a Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sat, 15 Apr 2017 10:01:27 +0200 Subject: [PATCH] Move some package adding tasks into the preparation phase --- bootstrapvz/common/tasks/kernel.py | 3 +-- bootstrapvz/plugins/docker_daemon/tasks.py | 2 +- bootstrapvz/providers/virtualbox/tasks/guest_additions.py | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/bootstrapvz/common/tasks/kernel.py b/bootstrapvz/common/tasks/kernel.py index b19c39b..8d5ac6f 100644 --- a/bootstrapvz/common/tasks/kernel.py +++ b/bootstrapvz/common/tasks/kernel.py @@ -6,8 +6,7 @@ import logging class AddDKMSPackages(Task): description = 'Adding DKMS and kernel header packages' - phase = phases.package_installation - successors = [packages.InstallPackages] + phase = phases.preparation @classmethod def run(cls, info): diff --git a/bootstrapvz/plugins/docker_daemon/tasks.py b/bootstrapvz/plugins/docker_daemon/tasks.py index e215188..bdbfc1b 100644 --- a/bootstrapvz/plugins/docker_daemon/tasks.py +++ b/bootstrapvz/plugins/docker_daemon/tasks.py @@ -14,7 +14,7 @@ ASSETS_DIR = rel_path(__file__, 'assets') class AddDockerDeps(Task): description = 'Add packages for docker deps' - phase = phases.package_installation + phase = phases.preparation DOCKER_DEPS = ['aufs-tools', 'btrfs-tools', 'git', 'iptables', 'procps', 'xz-utils', 'ca-certificates'] diff --git a/bootstrapvz/providers/virtualbox/tasks/guest_additions.py b/bootstrapvz/providers/virtualbox/tasks/guest_additions.py index dfcf1dc..570a034 100644 --- a/bootstrapvz/providers/virtualbox/tasks/guest_additions.py +++ b/bootstrapvz/providers/virtualbox/tasks/guest_additions.py @@ -22,8 +22,7 @@ class CheckGuestAdditionsPath(Task): class AddGuestAdditionsPackages(Task): description = 'Adding packages to support Guest Additions installation' - phase = phases.package_installation - successors = [InstallPackages] + phase = phases.preparation @classmethod def run(cls, info):