Merge pull request #232 from wrigri/master

Install GCE packages before Manifest packages.
This commit is contained in:
Anders Ingemann 2015-06-22 23:35:17 +02:00
commit 1ffbf1e18f

View file

@ -1,6 +1,7 @@
from bootstrapvz.base import Task from bootstrapvz.base import Task
from bootstrapvz.common import phases from bootstrapvz.common import phases
from bootstrapvz.common.tasks import apt from bootstrapvz.common.tasks import apt
from bootstrapvz.common.tasks import packages
from bootstrapvz.common.tools import config_get from bootstrapvz.common.tools import config_get
import logging import logging
import os import os
@ -9,6 +10,7 @@ import os
class DefaultPackages(Task): class DefaultPackages(Task):
description = 'Adding image packages required for GCE' description = 'Adding image packages required for GCE'
phase = phases.preparation phase = phases.preparation
successors = [packages.AddManifestPackages]
@classmethod @classmethod
def run(cls, info): def run(cls, info):
@ -32,6 +34,7 @@ class ReleasePackages(Task):
description = 'Adding release-specific packages required for GCE' description = 'Adding release-specific packages required for GCE'
phase = phases.preparation phase = phases.preparation
predecessors = [apt.AddBackports, DefaultPackages] predecessors = [apt.AddBackports, DefaultPackages]
successors = [packages.AddManifestPackages]
@classmethod @classmethod
def run(cls, info): def run(cls, info):
@ -49,6 +52,7 @@ class GooglePackages(Task):
description = 'Adding image packages required for GCE from Google repositories' description = 'Adding image packages required for GCE from Google repositories'
phase = phases.preparation phase = phases.preparation
predecessors = [DefaultPackages] predecessors = [DefaultPackages]
successors = [packages.AddManifestPackages]
@classmethod @classmethod
def run(cls, info): def run(cls, info):