kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix SetMetadataSource predecessors

Browse source 
Added GenerateLocale as SetMetadataSource predecessor, to avoid any
potential locale warnings. Also fixed a space indentation flaw and a
string which was being formatted with a non-existent key-argument.

This closes #75.
This commit is contained in:
Tiago Ilieve 2014-04-26 16:48:09 -03:00
parent 0f4884698d
commit 72492a6077
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstrapvz/plugins/cloud_init/tasks.py
View file

@ -2,6 +2,8 @@ from bootstrapvz.base import Task
from bootstrapvz.common import phases from bootstrapvz.common import phases
from bootstrapvz.common.tools import log_check_call from bootstrapvz.common.tools import log_check_call
from bootstrapvz.common.tasks import apt from bootstrapvz.common.tasks import apt
from bootstrapvz.common.tasks import locale
import logging
import os.path import os.path
@ -12,7 +14,6 @@ class AddBackports(Task):
@classmethod @classmethod
def run(cls, info): def run(cls, info):
if info.source_lists.target_exists('{system.release}-backports'): if info.source_lists.target_exists('{system.release}-backports'):
import logging
msg = ('{system.release}-backports target already exists').format(**info.manifest_vars) msg = ('{system.release}-backports target already exists').format(**info.manifest_vars)
logging.getLogger(__name__).info(msg) logging.getLogger(__name__).info(msg)
else: else:
@ -52,9 +53,9 @@ class SetUsername(Task):
class SetMetadataSource(Task): class SetMetadataSource(Task):
description = 'Setting metadata source' description = 'Setting metadata source'
#phase = phases.system_modification
phase = phases.package_installation phase = phases.package_installation
successors = [apt.AptUpdate] predecessors = [locale.GenerateLocale]
successors = [apt.AptUpdate]
@classmethod @classmethod
def run(cls, info): def run(cls, info):
@ -64,9 +65,8 @@ class SetMetadataSource(Task):
source_mapping = {'ec2': 'Ec2'} source_mapping = {'ec2': 'Ec2'}
sources = source_mapping.get(info.manifest.provider, None) sources = source_mapping.get(info.manifest.provider, None)
if sources is None: if sources is None:
import logging
msg = ('No cloud-init metadata source mapping found for provider `{provider}\', ' msg = ('No cloud-init metadata source mapping found for provider `{provider}\', '
'skipping selections setting.').format(info.manifest.provider) 'skipping selections setting.').format(provider=info.manifest.provider)
logging.getLogger(__name__).warn(msg) logging.getLogger(__name__).warn(msg)
return return
sources = "cloud-init cloud-init/datasources multiselect " + sources sources = "cloud-init cloud-init/datasources multiselect " + sources