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

Simpler check for whether to create image or use image in prebootstrapped plugin

Browse source
This commit is contained in:
Anders Ingemann 2015-01-15 22:44:55 +01:00
parent eaf8f8ea0f
commit e1946fcb68
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrapvz/plugins/prebootstrapped/__init__.py
View file

@ -37,13 +37,13 @@ def resolve_tasks(taskset, manifest):
guest_additions.InstallGuestAdditions, guest_additions.InstallGuestAdditions,
] ]
if manifest.volume['backing'] == 'ebs': if manifest.volume['backing'] == 'ebs':
if 'snapshot' in settings and settings['snapshot'] is not None: if settings.get('snapshot', None) is not None:
taskset.add(CreateFromSnapshot) taskset.add(CreateFromSnapshot)
[taskset.discard(task) for task in skip_tasks] [taskset.discard(task) for task in skip_tasks]
else: else:
taskset.add(Snapshot) taskset.add(Snapshot)
else: else:
if 'image' in settings and settings['image'] is not None: if settings.get('image', None) is not None:
taskset.add(CreateFromImage) taskset.add(CreateFromImage)
[taskset.discard(task) for task in skip_tasks] [taskset.discard(task) for task in skip_tasks]
else: else: