From be2e013270239c21b82e1e69009686d10571316d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 20 Jun 2016 08:29:37 +0000 Subject: [PATCH] OZ supports new Fedora releases. There's no real change between 20 and 22 except that non x86 needs at least version 22. We've been using this version without issue for some time on non x86 composees. Bring rawhide up to this so we're the same. Signed-off-by: Peter Robinson --- fedora.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fedora.conf b/fedora.conf index 9dc1c48..cffd9a5 100644 --- a/fedora.conf +++ b/fedora.conf @@ -288,7 +288,7 @@ image_build = { 'format': [('docker', 'tar.xz')] 'name': 'Fedora-Docker-Base', 'kickstart': 'fedora-docker-base.ks', - 'distro': 'Fedora-20', + 'distro': 'Fedora-22', 'disk_size': 3, 'arches': ['x86_64', 'armhfp'], 'repo_from': 'Cloud', @@ -303,7 +303,7 @@ image_build = { 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')] 'name': 'Fedora-Cloud-Base', 'kickstart': 'fedora-cloud-base.ks', - 'distro': 'Fedora-20', + 'distro': 'Fedora-22', 'disk_size': 3, 'arches': ['x86_64'], 'repo_from': 'Cloud', @@ -316,7 +316,7 @@ image_build = { 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')] 'name': 'Fedora-Cloud-Base-Vagrant', 'kickstart': 'fedora-cloud-base-vagrant.ks', - 'distro': 'Fedora-20', + 'distro': 'Fedora-22', 'disk_size': 40, 'arches': ['x86_64'], 'repo_from': 'Cloud', @@ -330,7 +330,7 @@ image_build = { 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')] 'name': 'Fedora-Atomic', 'kickstart': 'fedora-atomic.ks', - 'distro': 'Fedora-20', + 'distro': 'Fedora-22', 'disk_size': 6, 'arches': ['x86_64'], 'repo_from': 'Cloud', @@ -343,7 +343,7 @@ image_build = { 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')] 'name': 'Fedora-Atomic-Vagrant', 'kickstart': 'fedora-atomic-vagrant.ks', - 'distro': 'Fedora-20', + 'distro': 'Fedora-22', 'disk_size': 40, 'arches': ['x86_64'], 'repo_from': 'Cloud',