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

Correct merge/rebase. Fix handling of console to hvc0. Try and pre-seed cloud-init.

Browse source
This commit is contained in:
James Bromberger 2014-04-08 10:09:02 +00:00
parent 334ef9209b
commit b034ca8ed1
4 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bootstrapvz/common/tasks/apt.py
View file

@ -26,15 +26,10 @@ class AddDefaultSources(Task):
sections = 'main' sections = 'main'
if 'sections' in info.manifest.system: if 'sections' in info.manifest.system:
sections = ' '.join(info.manifest.system['sections']) 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 {apt_mirror} {system.release} '+sections)
info.source_lists.add('main', 'deb-src {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 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-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'}: 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 {apt_mirror} {system.release}-updates ' + sections)
info.source_lists.add('main', 'deb-src {apt_mirror} {system.release}-updates ' + sections) info.source_lists.add('main', 'deb-src {apt_mirror} {system.release}-updates ' + sections)

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

@ -14,8 +14,8 @@ def resolve_tasks(taskset, manifest):
if manifest.system['release'] in ['wheezy', 'stable']: if manifest.system['release'] in ['wheezy', 'stable']:
taskset.add(tasks.AddBackports) taskset.add(tasks.AddBackports)
taskset.update([tasks.AddCloudInitPackages, taskset.update([ tasks.SetMetadataSource,
tasks.SetMetadataSource, tasks.AddCloudInitPackages,
]) ])
options = manifest.plugins['cloud_init'] options = manifest.plugins['cloud_init']

3
manifests/ec2-ebs-debian-official-amd64-pvm.manifest.json
View file

@ -37,8 +37,7 @@
"plugins": { "plugins": {
"cloud_init": { "cloud_init": {
"username": "admin", "username": "admin",
//"metadata_sources": "Ec2", "metadata_sources": "Ec2"
"disable_modules": [ "landscape", "byobu", "ssh-import-id" ]
} }
} }
} }