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

Merge pull request #125 from jkaplowitz/development

Browse source 
Fix list of tasks and their ordering
This commit is contained in:
Tiago Ilieve 2014-07-25 01:18:04 -03:00
commit e2a7887ebf
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrapvz/common/tasks/network.py
View file

@ -5,7 +5,7 @@ import os
class RemoveDNSInfo(Task):
description = 'Removing resolv.conf'
phase = phases.system_modification
phase = phases.system_cleaning
@classmethod
def run(cls, info):
@ -15,7 +15,7 @@ class RemoveDNSInfo(Task):
class RemoveHostname(Task):
description = 'Removing the hostname file'
phase = phases.system_modification
phase = phases.system_cleaning
@classmethod
def run(cls, info):

2
bootstrapvz/plugins/puppet/tasks.py
View file

@ -1,7 +1,6 @@
from bootstrapvz.base import Task
from bootstrapvz.common import phases
from bootstrapvz.common.tasks import apt
from bootstrapvz.common.tasks import network
from bootstrapvz.common.tools import sed_i
import os
@ -62,7 +61,6 @@ class ApplyPuppetManifest(Task):
description = 'Applying puppet manifest'
phase = phases.system_modification
predecessors = [CopyPuppetAssets]
successors = [network.RemoveHostname, network.RemoveDNSInfo]
@classmethod
def run(cls, info):

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

@ -37,6 +37,7 @@ def resolve_tasks(taskset, manifest):
tasks.configuration.GatherReleaseInformation,
tasks.host.DisableIPv6,
tasks.host.SetHostname,
tasks.boot.ConfigureGrub,
initd.InstallInitScripts,
ssh.AddSSHKeyGeneration,

5
bootstrapvz/providers/gce/tasks/apt.py
View file

@ -1,6 +1,7 @@
from bootstrapvz.base import Task
from bootstrapvz.common import phases
from bootstrapvz.common.tasks import apt
from bootstrapvz.common.tasks import network
from bootstrapvz.common.tools import log_check_call
import os
@ -8,7 +9,7 @@ import os
class SetPackageRepositories(Task):
description = 'Adding apt sources'
phase = phases.preparation
successors = [apt.AddManifestSources]
predecessors = [apt.AddManifestSources]
@classmethod
def run(cls, info):
@ -39,7 +40,7 @@ class ImportGoogleKey(Task):
class CleanGoogleRepositoriesAndKeys(Task):
description = 'Removing Google key and apt source files'
phase = phases.system_cleaning
successors = [apt.AptClean]
successors = [apt.AptClean, network.RemoveDNSInfo]
@classmethod
def run(cls, info):