From b034ca8ed129754cd4a077d1b9920c901ff0761b Mon Sep 17 00:00:00 2001 From: James Bromberger Date: Tue, 8 Apr 2014 10:09:02 +0000 Subject: [PATCH] Correct merge/rebase. Fix handling of console to hvc0. Try and pre-seed cloud-init. --- bootstrapvz/common/tasks/apt.py | 5 ----- bootstrapvz/plugins/cloud_init/__init__.py | 4 ++-- bootstrapvz/plugins/cloud_init/tasks.py | 2 +- manifests/ec2-ebs-debian-official-amd64-pvm.manifest.json | 3 +-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/bootstrapvz/common/tasks/apt.py b/bootstrapvz/common/tasks/apt.py index a6f424b..7bb62cc 100644 --- a/bootstrapvz/common/tasks/apt.py +++ b/bootstrapvz/common/tasks/apt.py @@ -26,15 +26,10 @@ class AddDefaultSources(Task): sections = 'main' if 'sections' in info.manifest.system: sections = ' '.join(info.manifest.system['sections']) -<<<<<<< HEAD:common/tasks/apt.py info.source_lists.add('main', 'deb {apt_mirror} {system.release} '+sections) info.source_lists.add('main', 'deb-src {apt_mirror} {system.release} '+sections) info.source_lists.add('main', 'deb http://security.debian.org/ {system.release}/updates '+sections) info.source_lists.add('main', 'deb-src http://security.debian.org/ {system.release}/updates '+sections) -======= - info.source_lists.add('main', 'deb {apt_mirror} {system.release} ' + sections) - info.source_lists.add('main', 'deb-src {apt_mirror} {system.release} ' + sections) ->>>>>>> upstream/master:bootstrapvz/common/tasks/apt.py if info.manifest.system['release'] not in {'testing', 'unstable'}: info.source_lists.add('main', 'deb {apt_mirror} {system.release}-updates ' + sections) info.source_lists.add('main', 'deb-src {apt_mirror} {system.release}-updates ' + sections) diff --git a/bootstrapvz/plugins/cloud_init/__init__.py b/bootstrapvz/plugins/cloud_init/__init__.py index e1df533..3dd8682 100644 --- a/bootstrapvz/plugins/cloud_init/__init__.py +++ b/bootstrapvz/plugins/cloud_init/__init__.py @@ -14,8 +14,8 @@ def resolve_tasks(taskset, manifest): if manifest.system['release'] in ['wheezy', 'stable']: taskset.add(tasks.AddBackports) - taskset.update([tasks.AddCloudInitPackages, - tasks.SetMetadataSource, + taskset.update([ tasks.SetMetadataSource, + tasks.AddCloudInitPackages, ]) options = manifest.plugins['cloud_init'] diff --git a/bootstrapvz/plugins/cloud_init/tasks.py b/bootstrapvz/plugins/cloud_init/tasks.py index 51a9f2f..4e6b41d 100644 --- a/bootstrapvz/plugins/cloud_init/tasks.py +++ b/bootstrapvz/plugins/cloud_init/tasks.py @@ -67,7 +67,7 @@ class SetMetadataSource(Task): 'skipping selections setting.').format(info.manifest.provider) logging.getLogger(__name__).warn(msg) return - sources = "cloud-init cloud-init/datasources multiselect " + sources + sources = "cloud-init cloud-init/datasources multiselect " + sources log_check_call(['chroot', info.root, 'debconf-set-selections'], sources) diff --git a/manifests/ec2-ebs-debian-official-amd64-pvm.manifest.json b/manifests/ec2-ebs-debian-official-amd64-pvm.manifest.json index 9fb8095..34ced43 100644 --- a/manifests/ec2-ebs-debian-official-amd64-pvm.manifest.json +++ b/manifests/ec2-ebs-debian-official-amd64-pvm.manifest.json @@ -37,8 +37,7 @@ "plugins": { "cloud_init": { "username": "admin", - //"metadata_sources": "Ec2", - "disable_modules": [ "landscape", "byobu", "ssh-import-id" ] + "metadata_sources": "Ec2" } } }