mirror of
https://github.com/kevingruesser/bootstrap-vz.git
synced 2025-08-24 07:26:29 +00:00
Prebootstrapped plugin now supports parted
This commit is contained in:
parent
866b2a9242
commit
f0838cc77d
2 changed files with 12 additions and 7 deletions
|
@ -3,12 +3,13 @@ from tasks import CopyImage
|
||||||
from tasks import CreateFromSnapshot
|
from tasks import CreateFromSnapshot
|
||||||
from tasks import CreateFromImage
|
from tasks import CreateFromImage
|
||||||
from providers.ec2.tasks import ebs
|
from providers.ec2.tasks import ebs
|
||||||
from providers.ec2.tasks import loopback
|
from common.tasks import loopback
|
||||||
|
from common.tasks import bootstrap
|
||||||
|
from common.tasks import filesystem
|
||||||
|
from common.tasks import parted
|
||||||
|
|
||||||
|
|
||||||
def tasks(tasklist, manifest):
|
def tasks(tasklist, manifest):
|
||||||
from providers.ec2.tasks import bootstrap
|
|
||||||
from providers.ec2.tasks import filesystem
|
|
||||||
settings = manifest.plugins['prebootstrapped']
|
settings = manifest.plugins['prebootstrapped']
|
||||||
if manifest.volume['backing'] == 'ebs':
|
if manifest.volume['backing'] == 'ebs':
|
||||||
if 'snapshot' in settings and settings['snapshot'] is not None:
|
if 'snapshot' in settings and settings['snapshot'] is not None:
|
||||||
|
@ -22,8 +23,12 @@ def tasks(tasklist, manifest):
|
||||||
tasklist.add(Snapshot())
|
tasklist.add(Snapshot())
|
||||||
else:
|
else:
|
||||||
if 'image' in settings and settings['image'] is not None:
|
if 'image' in settings and settings['image'] is not None:
|
||||||
tasklist.replace(loopback.Create, CreateFromImage())
|
tasklist.add(CreateFromImage())
|
||||||
tasklist.remove(filesystem.FormatVolume,
|
tasklist.remove(loopback.Create,
|
||||||
|
loopback.CreateQemuImg,
|
||||||
|
parted.PartitionVolume,
|
||||||
|
parted.FormatPartitions,
|
||||||
|
filesystem.FormatVolume,
|
||||||
filesystem.TuneVolumeFS,
|
filesystem.TuneVolumeFS,
|
||||||
filesystem.AddXFSProgs,
|
filesystem.AddXFSProgs,
|
||||||
bootstrap.MakeTarball,
|
bootstrap.MakeTarball,
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
from base import Task
|
from base import Task
|
||||||
from common import phases
|
from common import phases
|
||||||
from providers.ec2.tasks import ebs
|
from providers.ec2.tasks import ebs
|
||||||
from providers.ec2.tasks import loopback
|
from common.tasks import loopback
|
||||||
from providers.ec2.tasks import bootstrap
|
from common.tasks import bootstrap
|
||||||
import time
|
import time
|
||||||
import logging
|
import logging
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
Loading…
Add table
Reference in a new issue