update the image building config options for pungi changes

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2016-02-11 08:10:14 -06:00
parent 781193b94b
commit b307398386

View File

@ -254,40 +254,52 @@ translate_paths = [
image_build = {
'^Cloud$': [
{
'format': [('docker', 'tar.xz')]
'name': 'Fedora-Docker-Base',
'target': 'f24',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': "fedora-docker-base.ks",
'distro': 'Fedora-20',
'disk_size': 3,
'arches': ['x86_64', 'i386']
},
{
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
'name': 'Fedora-Cloud-Base',
'target': 'f24',
'version': 'Rawhide',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': "fedora-cloud-base.ks",
'distro': 'Fedora-20',
'disk_size': 3,
'arches': ['x86_64', 'i386']
},
{
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
'name': 'Fedora-Cloud-Base-Vagrant',
'target': 'f24',
'version': 'Rawhide',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': "fedora-cloud-base-vagrant.ks",
'distro': 'Fedora-20',
'disk_size': 40,
'arches': ['x86_64', 'i386']
{
'image-build': {
{
'format': [('docker', 'tar.xz')]
'name': 'Fedora-Docker-Base',
'target': 'f24',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': "fedora-docker-base.ks",
'distro': 'Fedora-20',
'disk_size': 3,
'arches': ['x86_64', 'i386']
}
}
},
{
'image-build': {
{
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
'name': 'Fedora-Cloud-Base',
'target': 'f24',
'version': 'Rawhide',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': "fedora-cloud-base.ks",
'distro': 'Fedora-20',
'disk_size': 3,
'arches': ['x86_64', 'i386']
}
}
},
{
'image-build': {
{
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
'name': 'Fedora-Cloud-Base-Vagrant',
'target': 'f24',
'version': 'Rawhide',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': "fedora-cloud-base-vagrant.ks",
'distro': 'Fedora-20',
'disk_size': 40,
'arches': ['x86_64', 'i386']
}
}
}
],
}