Reduce duplication in configuration

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-04-14 13:57:27 +02:00
parent 1a2692bdaf
commit 21024d15e0

View File

@ -273,17 +273,19 @@ translate_paths = [
]
# These will be inherited by live_media, live_images and image_build
global_ksurl = 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD'
global_release = None
global_version = 'Rawhide'
# live_images ignores this in favor of live_target
global_target = 'f25'
image_build = {
'^Docker$': [
{
'image-build': {
'format': [('docker', 'tar.xz')]
'name': 'Fedora-Docker-Base',
'target': 'f25',
'version': 'Rawhide',
'release': None,
# 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,
@ -299,10 +301,6 @@ image_build = {
'image-build': {
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
'name': 'Fedora-Cloud-Base',
'target': 'f25',
'version': 'Rawhide',
'release': None,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': 'fedora-cloud-base.ks',
'distro': 'Fedora-20',
'disk_size': 3,
@ -316,10 +314,6 @@ image_build = {
'image-build': {
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
'name': 'Fedora-Cloud-Base-Vagrant',
'target': 'f25',
'version': 'Rawhide',
'release': None,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': 'fedora-cloud-base-vagrant.ks',
'distro': 'Fedora-20',
'disk_size': 40,
@ -333,10 +327,6 @@ image_build = {
'image-build': {
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
'name': 'Fedora-Atomic',
'target': 'f25',
'version': 'Rawhide',
'release': None,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': 'fedora-atomic.ks',
'distro': 'Fedora-20',
'disk_size': 6,
@ -350,10 +340,6 @@ image_build = {
'image-build': {
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
'name': 'Fedora-Atomic-Vagrant',
'target': 'f25',
'version': 'Rawhide',
'release': None,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': 'fedora-atomic-vagrant.ks',
'distro': 'Fedora-20',
'disk_size': 40,
@ -366,12 +352,6 @@ image_build = {
],
}
# These will be inherited for all live media
live_media_ksurl = 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD'
live_media_release = None
live_media_version = 'Rawhide'
live_media_target = 'f25'
live_media = {
'^Workstation$': [
{
@ -512,9 +492,6 @@ live_images = [
'armhfp': {
'kickstart': 'fedora-arm-workstation.ks',
'name': 'Fedora-Workstation-armhfp',
'version': 'Rawhide',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'release': None,
'type': 'appliance'
}
}),
@ -522,9 +499,6 @@ live_images = [
'armhfp': {
'kickstart': 'fedora-arm-server.ks',
'name': 'Fedora-Server-armhfp',
'version': 'Rawhide',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'release': None,
'type': 'appliance'
}
}),
@ -532,9 +506,6 @@ live_images = [
'armhfp': [{
'kickstart': 'fedora-arm-kde.ks',
'name': 'Fedora-KDE-armhfp',
'version': 'Rawhide',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'release': None,
'repo_from': 'Everything',
'type': 'appliance',
'subvariant': 'KDE'
@ -542,9 +513,6 @@ live_images = [
{
'kickstart': 'fedora-arm-lxde.ks',
'name': 'Fedora-LXDE-armhfp',
'version': 'Rawhide',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'release': None,
'repo_from': 'Everything',
'type': 'appliance',
'subvariant': 'LXDE'
@ -552,9 +520,6 @@ live_images = [
{
'kickstart': 'fedora-arm-mate.ks',
'name': 'Fedora-Mate-armhfp',
'version': 'Rawhide',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'release': None,
'repo_from': 'Everything',
'type': 'appliance',
'subvariant': 'Mate'
@ -562,9 +527,6 @@ live_images = [
{
'kickstart': 'fedora-arm-minimal.ks',
'name': 'Fedora-Minimal-armhfp',
'version': 'Rawhide',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'release': None,
'repo_from': 'Everything',
'type': 'appliance',
'subvariant': 'Minimal'
@ -572,9 +534,6 @@ live_images = [
{
'kickstart': 'fedora-arm-soas.ks',
'name': 'Fedora-SoaS-armhfp',
'version': 'Rawhide',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'release': None,
'repo_from': 'Everything',
'type': 'appliance',
'subvariant': 'SoaS'
@ -582,9 +541,6 @@ live_images = [
{
'kickstart': 'fedora-arm-xfce.ks',
'name': 'Fedora-Xfce-armhfp',
'version': 'Rawhide',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'release': None,
'repo_from': 'Everything',
'type': 'appliance',
'subvariant': 'Xfce'