From 72492a6077c68575f713af1ee4303c4a2ad21af8 Mon Sep 17 00:00:00 2001 From: Tiago Ilieve Date: Sat, 26 Apr 2014 16:48:09 -0300 Subject: [PATCH] Fix SetMetadataSource predecessors 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. --- bootstrapvz/plugins/cloud_init/tasks.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bootstrapvz/plugins/cloud_init/tasks.py b/bootstrapvz/plugins/cloud_init/tasks.py index dde46d6..007ad86 100644 --- a/bootstrapvz/plugins/cloud_init/tasks.py +++ b/bootstrapvz/plugins/cloud_init/tasks.py @@ -2,6 +2,8 @@ from bootstrapvz.base import Task from bootstrapvz.common import phases from bootstrapvz.common.tools import log_check_call from bootstrapvz.common.tasks import apt +from bootstrapvz.common.tasks import locale +import logging import os.path @@ -12,7 +14,6 @@ class AddBackports(Task): @classmethod def run(cls, info): if info.source_lists.target_exists('{system.release}-backports'): - import logging msg = ('{system.release}-backports target already exists').format(**info.manifest_vars) logging.getLogger(__name__).info(msg) else: @@ -52,9 +53,9 @@ class SetUsername(Task): class SetMetadataSource(Task): description = 'Setting metadata source' - #phase = phases.system_modification phase = phases.package_installation - successors = [apt.AptUpdate] + predecessors = [locale.GenerateLocale] + successors = [apt.AptUpdate] @classmethod def run(cls, info): @@ -64,9 +65,8 @@ class SetMetadataSource(Task): source_mapping = {'ec2': 'Ec2'} sources = source_mapping.get(info.manifest.provider, None) if sources is None: - import logging 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) return sources = "cloud-init cloud-init/datasources multiselect " + sources