Add example testing manifest and configuration, fix apt sources configuration.

This commit is contained in:
Tomasz Rybak 2014-01-25 16:49:59 +01:00
parent 99ae9988ff
commit f3195b5f6b
4 changed files with 51 additions and 1 deletions

View file

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

View file

@ -7,6 +7,9 @@
"wheezy": [
"auto eth0",
"iface eth0 inet dhcp" ],
"testing": [
"auto eth0",
"iface eth0 inet dhcp" ],
"unstable": [
"auto eth0",
"iface eth0 inet dhcp" ]

View file

@ -0,0 +1,44 @@
{
"provider": "ec2",
"virtualization": "pvm",
"credentials": {
// "access-key": null,
// "secret-key": null
},
"bootstrapper": {
"workspace": "/target"
},
"image": {
"name": "debian-{system.release}-{system.architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs",
"description": "Debian {system.release} {system.architecture}"
},
"system": {
"release": "testing",
"architecture": "amd64",
"bootloader": "pvgrub",
"timezone": "UTC",
"locale": "en_US",
"charmap": "UTF-8"
},
"packages": {
"mirror": "http://cloudfront.debian.net/debian"
},
"volume": {
"backing": "ebs",
"partitions": {
"type": "none",
"root": {
"size": "8GiB",
"filesystem": "ext4"
}
}
},
"plugins": {
"cloud_init": {
"username": "admin",
//"metadata_sources": "Ec2",
"disable_modules": [ "landscape", "byobu", "ssh-import-id" ]
}
}
}

View file

@ -5,6 +5,9 @@
"wheezy": {
"amd64": "linux-image-amd64",
"i386" : "linux-image-686" },
"testing": {
"amd64": "linux-image-amd64",
"i386" : "linux-image-686" },
"unstable": {
"amd64": "linux-image-amd64",
"i386" : "linux-image-686" }