Remove deprecated options

The old options still work, but generate a warning during validation.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-05-10 08:54:09 +02:00
parent 81a3daa489
commit a813f127f9

View File

@ -282,7 +282,7 @@ image_build = {
'distro': 'Fedora-22',
'disk_size': 5,
'arches': ['armhfp', 'aarch64', 'x86_64'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Docker_Base',
'failable': ['*'],
@ -307,7 +307,7 @@ image_build = {
'distro': 'Fedora-22',
'disk_size': 5,
'arches': ['armhfp', 'aarch64', 'x86_64'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Container_Minimal_Base',
'failable': ['*'],
@ -334,7 +334,7 @@ image_build = {
'distro': 'Fedora-22',
'disk_size': 4,
'arches': ['aarch64', 'x86_64'],
'repo_from': 'Cloud',
'repo': 'Cloud',
'install_tree_from': 'Cloud',
'subvariant': 'Cloud_Base',
'failable': ['*'],
@ -348,7 +348,7 @@ image_build = {
'distro': 'Fedora-22',
'disk_size': 40,
'arches': ['x86_64'],
'repo_from': 'Cloud',
'repo': 'Cloud',
'install_tree_from': 'Cloud',
'subvariant': 'Cloud_Base',
'failable': ['*'],
@ -365,7 +365,7 @@ image_build = {
'distro': 'Fedora-22',
'disk_size': 6,
'arches': ['x86_64'],
'repo_from': 'Cloud',
'repo': 'Cloud',
'install_tree_from': 'Cloud',
'subvariant': 'Atomic',
'failable': ['*'],
@ -379,7 +379,7 @@ image_build = {
'distro': 'Fedora-22',
'disk_size': 40,
'arches': ['x86_64'],
'repo_from': 'Cloud',
'repo': 'Cloud',
'install_tree_from': 'Cloud',
'subvariant': 'Atomic',
'failable': ['*'],
@ -398,7 +398,7 @@ image_build = {
'distro': 'Fedora-22',
'disk_size': 40,
'arches': ['x86_64','i386'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Python_Classroom',
'failable': ['*'],
@ -417,7 +417,7 @@ image_build = {
'distro': 'Fedora-22',
'disk_size': 5,
'arches': ['aarch64'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Minimal',
'failable': ['*'],
@ -433,7 +433,7 @@ image_build = {
'distro': 'Fedora-22',
'disk_size': 8,
'arches': ['aarch64'],
'repo_from': 'Workstation',
'repo': 'Workstation',
'install_tree_from': 'Workstation',
'subvariant': 'Workstation',
'failable': ['*'],
@ -449,7 +449,7 @@ image_build = {
'distro': 'Fedora-22',
'disk_size': 7,
'arches': ['aarch64'],
'repo_from': 'Server',
'repo': 'Server',
'install_tree_from': 'Server',
'subvariant': 'Server',
'failable': ['*'],
@ -465,7 +465,7 @@ live_media = {
'kickstart': 'fedora-live-workstation.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'subvariant': 'Workstation'
}
@ -476,7 +476,7 @@ live_media = {
'kickstart': 'fedora-live-kde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'KDE'
@ -486,7 +486,7 @@ live_media = {
'kickstart': 'fedora-live-xfce.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Xfce'
},
@ -495,7 +495,7 @@ live_media = {
'kickstart': 'fedora-live-soas.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'SoaS'
},
@ -504,7 +504,7 @@ live_media = {
'kickstart': 'fedora-live-cinnamon.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Cinnamon'
},
@ -513,7 +513,7 @@ live_media = {
'kickstart': 'fedora-live-lxde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'LXDE'
},
@ -522,7 +522,7 @@ live_media = {
'kickstart': 'fedora-live-mate_compiz.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Mate'
},
@ -531,7 +531,7 @@ live_media = {
'kickstart': 'fedora-live-lxqt.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'LXQt'
}
@ -542,7 +542,7 @@ live_media = {
'kickstart': 'fedora-live-astronomy_kde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Astronomy_KDE'
},
@ -551,7 +551,7 @@ live_media = {
'kickstart': 'fedora-live-design_suite.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Design_suite'
},
@ -560,7 +560,7 @@ live_media = {
'kickstart': 'fedora-live-scientific_kde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Scientific_KDE'
},
@ -569,7 +569,7 @@ live_media = {
'kickstart': 'fedora-live-games.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Games'
},
@ -578,7 +578,7 @@ live_media = {
'kickstart': 'fedora-live-security.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Security'
},
@ -587,7 +587,7 @@ live_media = {
'kickstart': 'fedora-live-jam_kde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Jam_KDE'
},
@ -596,7 +596,7 @@ live_media = {
'kickstart': 'fedora-live-robotics.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Robotics'
},
@ -605,7 +605,7 @@ live_media = {
'kickstart': 'fedora-live-python-classroom.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything',
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Python_Classroom'
}
@ -645,7 +645,7 @@ live_images = [
'armhfp': [{
'kickstart': 'fedora-arm-kde.ks',
'name': 'Fedora-KDE-armhfp',
'repo_from': 'Everything',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'KDE',
'failable': True,
@ -653,7 +653,7 @@ live_images = [
{
'kickstart': 'fedora-arm-lxde.ks',
'name': 'Fedora-LXDE-armhfp',
'repo_from': 'Everything',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'LXDE',
'failable': True,
@ -661,7 +661,7 @@ live_images = [
{
'kickstart': 'fedora-arm-mate.ks',
'name': 'Fedora-Mate-armhfp',
'repo_from': 'Everything',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'Mate',
'failable': True,
@ -669,7 +669,7 @@ live_images = [
{
'kickstart': 'fedora-arm-minimal.ks',
'name': 'Fedora-Minimal-armhfp',
'repo_from': 'Everything',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'Minimal',
'failable': True,
@ -677,7 +677,7 @@ live_images = [
{
'kickstart': 'fedora-arm-soas.ks',
'name': 'Fedora-SoaS-armhfp',
'repo_from': 'Everything',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'SoaS',
'failable': True,
@ -685,7 +685,7 @@ live_images = [
{
'kickstart': 'fedora-arm-xfce.ks',
'name': 'Fedora-Xfce-armhfp',
'repo_from': 'Everything',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'Xfce',
'failable': True,
@ -693,7 +693,7 @@ live_images = [
{
'kickstart': 'fedora-arm-lxqt.ks',
'name': 'Fedora-LXQt-armhfp',
'repo_from': 'Everything',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'LXQt',
'failable': True,
@ -703,7 +703,7 @@ live_images = [
'armhfp': {
'kickstart': 'fedora-arm-python-classroom.ks',
'name': 'Fedora-Python-Classroom-armhfp',
'repo_from': 'Everything',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'Python_Classroom',
'failable': True,
@ -717,7 +717,7 @@ ostree = [
"treefile": "fedora-atomic-docker-host.json",
"config_url": "https://pagure.io/fedora-atomic.git",
"config_branch": "master",
"source_repo_from": "Everything",
"repo": "Everything",
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
'failable': ['*'],
},
@ -725,7 +725,7 @@ ostree = [
"treefile": "fedora-atomic-docker-host.json",
"config_url": "https://pagure.io/fedora-atomic.git",
"config_branch": "master",
"source_repo_from": "Everything",
"repo": "Everything",
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
'failable': ['*'],
},
@ -733,7 +733,7 @@ ostree = [
"treefile": "fedora-atomic-docker-host.json",
"config_url": "https://pagure.io/fedora-atomic.git",
"config_branch": "master",
"source_repo_from": "Everything",
"repo": "Everything",
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
'failable': ['*'],
}
@ -743,7 +743,7 @@ ostree = [
"treefile": "fedora-ostree-workstation.json",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "master",
"source_repo_from": "Workstation",
"repo": "Workstation",
"ostree_repo": "/mnt/koji/compose/ostree/rawhide/",
'failable': ['*'],
}
@ -753,7 +753,7 @@ ostree = [
ostree_installer = [
("^Atomic$", {
"x86_64": {
"source_repo_from": "Everything",
"repo": "Everything",
"release": None,
"installpkgs": ["fedora-productimg-atomic"],
"rootfs_size": "3",
@ -769,7 +769,7 @@ ostree_installer = [
'failable': ['*'],
},
"aarch64": {
"source_repo_from": "Everything",
"repo": "Everything",
"release": None,
"installpkgs": ["fedora-productimg-atomic"],
"rootfs_size": "3",
@ -785,7 +785,7 @@ ostree_installer = [
'failable': ['*'],
},
"ppc64le": {
"source_repo_from": "Everything",
"repo": "Everything",
"release": None,
"installpkgs": ["fedora-productimg-atomic"],
"rootfs_size": "3",
@ -803,7 +803,7 @@ ostree_installer = [
}),
("^Workstation$", {
"x86_64": {
"source_repo_from": "Everything",
"repo": "Everything",
"release": None,
"installpkgs": ["fedora-productimg-workstation"],
"add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],