From dee604f1becbf8366deeded98be66a2476b85920 Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Fri, 15 Apr 2016 13:23:45 +0000
Subject: [PATCH 1/2] osbs-master: use docker-storage-setup

Signed-off-by: Adam Miller <admiller@redhat.com>
---
 playbooks/groups/osbs-master.yml | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml
index 6645d5f4be..5023cca059 100644
--- a/playbooks/groups/osbs-master.yml
+++ b/playbooks/groups/osbs-master.yml
@@ -40,6 +40,11 @@
   tasks:
     - include: "{{tasks}}/osbs_repos.yml"
 
+    - name: copy docker-storage-setup config
+      copy:
+        src: "{{files}}/osbs/docker-storage-setup"
+        dest:  "/etc/sysconfig/docker-storage-setup"
+
     - name: create cert dir for openshift public facing REST API SSL
       file:
         path: "/etc/origin/master/named_certificates"
@@ -226,18 +231,6 @@
         dest: "{{ koji_ca_cert_path }}"
       notify: oc secrets new
 
-    - name: setup logical volume for docker cache
-      lvol:
-        vg: "vg-docker"
-        lv: "metadata"
-        size: "4g"
-
-    - name: setup logical volume for docker data storage
-      lvol:
-        vg: "vg-docker"
-        lv: "data"
-        size: "55g"
-
     - name: install docker
       action: "{{ ansible_pkg_mgr }} name=docker state=installed"
 
@@ -256,10 +249,8 @@
         src: "{{private}}/files/koji/containerbuild.key.pem"
         dest: "{{docker_cert_dir}}/client.key"
 
-    - name: copy docker storage config
-      copy:
-        src: "{{files}}/osbs/docker-storage"
-        dest: "/etc/sysconfig/docker-storage"
+    - name: run docker-storage-setup
+      shell: "docker-storage-setup"
 
     - name: start and enable docker
       service: name=docker state=started enabled=yes

From 11dc6ffa072f5bea07d9ba2c2c9b521c30f3f8a9 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 15 Apr 2016 13:24:05 +0000
Subject: [PATCH 2/2] koschei: correct play name

---
 roles/koschei/frontend/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/koschei/frontend/tasks/main.yml b/roles/koschei/frontend/tasks/main.yml
index c614c9ee0f..575dc56c63 100644
--- a/roles/koschei/frontend/tasks/main.yml
+++ b/roles/koschei/frontend/tasks/main.yml
@@ -44,7 +44,7 @@
   - koschei
   - config
 
-- name: allow httpd to connect to db
+- name: set httpd selinux booleans
   seboolean: name={{ item }} state=yes persistent=yes
   with_items:
   - httpd_can_network_connect