From 6153e4f4b3e7fb353d5e6a92a6efd683c23cb8ff Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mar 14 2015 19:11:27 +0000
Subject: ansible: Create output dir correctly


---

diff --git a/ansible/atomic01-rsyncd.yml b/ansible/atomic01-rsyncd.yml
index 3aa97ff..1179bf2 100644
--- a/ansible/atomic01-rsyncd.yml
+++ b/ansible/atomic01-rsyncd.yml
@@ -2,10 +2,6 @@
   sudo: yes
 
   tasks:
-    - name: Ensure public_content_t label
-      file: path=/srv/fedora-atomic/output setype=public_content_t recurse=yes
-            state=directory
-
     - name: Set up rsync export for fedora-atomic
       action: ini_file
         dest=/etc/rsyncd.conf
diff --git a/ansible/provision.yml b/ansible/provision.yml
index fab40cf..f2cac34 100644
--- a/ansible/provision.yml
+++ b/ansible/provision.yml
@@ -37,21 +37,31 @@
         - rpm-ostree
         - rpm-ostree-toolbox
         - docker
+        - docker-registry
 
     - service: name=docker.service enabled=yes state=started
 
     - service: name=libvirtd.socket enabled=yes state=started
 
-    - file: path={{ inboxdir }}
-            owner=root group=rpmostreecompose mode=775 state=directory
+    - name: Create output directory
+      file: path={{ outputdir }} setype=public_content_t recurse=yes
+            state=directory
+
+    - name: Create output images dir
+      file: path={{ outputdir }}/images
+            state=directory
 
-    - file: path={{ outputdir }}/repo
+    - name: Create output repo dir
+      file: path={{ outputdir }}/repo
             owner=root group=root mode=755 state=directory
 
     - command: /usr/bin/ostree init --repo={{ outputdir }}/repo --mode=archive-z2
       args:
         creates: "{{ outputdir }}/repo/objects"
 
+    - file: path={{ inboxdir }}
+            owner=root group=rpmostreecompose mode=775 state=directory
+
     - yum: name={{ item }} state=present
       with_items:
         - httpd
diff --git a/ansible/setup-composes.yml b/ansible/setup-composes.yml
index cdbeb74..ca9ee45 100644
--- a/ansible/setup-composes.yml
+++ b/ansible/setup-composes.yml
@@ -3,7 +3,7 @@
 
   vars:
     datadir: /srv/fedora-atomic
-    outputdir: /srv/fedora-atomic
+    outputdir: /srv/fedora-atomic/output
     inboxdir: /srv/fedora-atomic/inbox
     releases:
       - name: f22
@@ -32,6 +32,14 @@
             owner=root group=root state=link
       with_items: releases
 
+    - file: path={{ outputdir }}/images/{{ item.name }}
+            owner=root group=root state=directory
+      with_items: releases
+
+    - file: path={{ datadir }}/{{ item.name }}/images src=../output/images/{{ item.name }}
+            owner=root group=root state=link
+      with_items: releases
+
     - file: path={{ datadir }}/{{ item.name }}/tasks/treecompose
             owner=root group=root mode=755 state=directory
       with_items: releases