From de86c341c1ea4a675d889c59a2eaadfb78256f0c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 8 Apr 2016 10:18:48 -0500
Subject: [PATCH] renable ostree deliverables, enable docker base images for
 arm

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
---
 fedora.conf | 64 ++++++++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/fedora.conf b/fedora.conf
index 8776261..d53a760 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -287,7 +287,7 @@ image_build = {
                     'kickstart': 'fedora-docker-base.ks',
                     'distro': 'Fedora-20',
                     'disk_size': 3,
-                    'arches': ['x86_64'],
+                    'arches': ['x86_64', 'armv7hl'],
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Docker_Base'
@@ -558,38 +558,38 @@ live_images = [
     }),
 ]
 
-#ostree = [
-#    ("^Atomic$", {
-#        "x86_64": {
-#            "treefile": "fedora-atomic-docker-host.json",
-#            "config_url": "https://pagure.io/fedora-atomic.git",
-#            "source_repo_from": "Everything",
-#            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/"
-#        }
-#    })
-#]
+ostree = [
+    ("^Atomic$", {
+        "x86_64": {
+            "treefile": "fedora-atomic-docker-host.json",
+            "config_url": "https://pagure.io/fedora-atomic.git",
+            "source_repo_from": "Everything",
+            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/"
+        }
+    })
+]
 
-#ostree_installer = [
-#    ("^Atomic$", {
-#        "x86_64": {
-#            "source_repo_from": "Everything",
-#            "release": None,
-#            "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(compose_date)s.iso",
-#            "installpkgs": ["fedora-productimg-atomic"],
-#            "add_template": ["/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl"],
-#            "add_template_var": [
-#                "ostree_osname=fedora-atomic",
-#                "ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host",
-#            ],
-#            "add_arch_template": ["/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl"],
-#            "add_arch_template_var": [
-#                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
-#                "ostree_osname=fedora-atomic",
-#                "ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host",
-#            ]
-#        }
-#    })
-#]
+ostree_installer = [
+    ("^Atomic$", {
+        "x86_64": {
+            "source_repo_from": "Everything",
+            "release": None,
+            "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(compose_date)s.iso",
+            "installpkgs": ["fedora-productimg-atomic"],
+            "add_template": ["/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl"],
+            "add_template_var": [
+                "ostree_osname=fedora-atomic",
+                "ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
+            ],
+            "add_arch_template": ["/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl"],
+            "add_arch_template_var": [
+                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
+                "ostree_osname=fedora-atomic",
+                "ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
+            ]
+        }
+    })
+]
 
 release_id_allow_missing = True
 koji_profile = 'koji'