From 58e87d923efc6b3950014e400a07ce167d72e9d3 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sep 29 2016 20:20:23 +0000
Subject: fix up config for pungi 4.1.9


Signed-off-by: Dennis Gilmore <dennis@ausil.us>

---

diff --git a/fedora.conf b/fedora.conf
index 91457e2..960f76d 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -42,8 +42,6 @@ pkgset_source = 'koji' # koji, repos
 # pkgset_repos = {}
 
 # PKGSET - KOJI
-pkgset_koji_path_prefix = '/mnt/koji/'
-pkgset_koji_url = 'http://koji.fedoraproject.org/kojihub'
 pkgset_koji_tag = 'f25'
 pkgset_koji_inherit = False
 
@@ -63,10 +61,6 @@ greedy_method = 'build'
 #gather_source_mapping = '/path/to/mapping.json'
 
 
-link_files = 'hardlink-or-copy'
-
-notification_script = '/usr/bin/pungi-fedmsg-notification'
-
 # CREATEREPO
 createrepo_c = True
 createrepo_checksum = 'sha256'
@@ -284,11 +278,11 @@ global_target = 'f25'
 image_build = {
     '^Docker$': [
         {
-            'failable': ['*'],
             'image-build': {
                     'format': [('docker', 'tar.xz')]
                     'name': 'Fedora-Docker-Base',
                     'kickstart': 'fedora-docker-base.ks',
+                    'failable': ['*'],
                     'distro': 'Fedora-22',
                     'disk_size': 3,
                     'arches': ['x86_64', 'armhfp'],
@@ -300,11 +294,11 @@ image_build = {
         ],
     '^CloudImages$': [
         {
-            'failable': ['*'],
             'image-build': {
                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
                     'name': 'Fedora-Cloud-Base',
                     'kickstart': 'fedora-cloud-base.ks',
+                    'failable': ['*'],
                     'distro': 'Fedora-22',
                     'disk_size': 3,
                     'arches': ['x86_64'],
@@ -314,11 +308,11 @@ image_build = {
                      }
         },
         {
-            'failable': ['*'],
             'image-build': {
                     'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
                     'name': 'Fedora-Cloud-Base-Vagrant',
                     'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'failable': ['*'],
                     'distro': 'Fedora-22',
                     'disk_size': 40,
                     'arches': ['x86_64'],
@@ -329,11 +323,11 @@ image_build = {
                      }
         },
         {
-            'failable': ['*'],
             'image-build': {
                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
                     'name': 'Fedora-Atomic',
                     'kickstart': 'fedora-atomic.ks',
+                    'failable': ['*'],
                     'distro': 'Fedora-22',
                     'disk_size': 6,
                     'arches': ['x86_64'],
@@ -343,11 +337,11 @@ image_build = {
                      }
         },
         {
-            'failable': ['*'],
             'image-build': {
                     'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
                     'name': 'Fedora-Atomic-Vagrant',
                     'kickstart': 'fedora-atomic-vagrant.ks',
+                    'failable': ['*'],
                     'distro': 'Fedora-22',
                     'disk_size': 40,
                     'arches': ['x86_64'],
@@ -603,7 +597,6 @@ ostree_installer = [
         "x86_64": {
             "source_repo_from": "Everything",
             "release": None,
-            "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(date)s.iso",
             "installpkgs": ["fedora-productimg-atomic"],
             "add_template": ["atomic-installer/lorax-configure-repo.tmpl"],
             "add_template_var": [
@@ -625,7 +618,6 @@ ostree_installer = [
         "x86_64": {
             "source_repo_from": "Everything",
             "release": None,
-            "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(date)s.iso",
             "installpkgs": ["fedora-productimg-atomic"],
             "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
             "add_template_var": [
@@ -645,5 +637,4 @@ ostree_installer = [
     })
 ]
 
-release_id_allow_missing = True
 koji_profile = 'koji'