From 4c4aa32943c7e1d4bc96e7574af4c3ace8f94eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Han?= <sebhan@cisco.com>
Date: Tue, 20 Oct 2015 17:05:34 +0200
Subject: [PATCH] Create missing directories when deploying with docker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sébastien Han <sebhan@cisco.com>
---
 roles/ceph-mds/tasks/docker/pre_requisite.yml | 5 ++++-
 roles/ceph-mon/tasks/docker/pre_requisite.yml | 9 +++++----
 roles/ceph-osd/tasks/docker/pre_requisite.yml | 5 ++++-
 roles/ceph-rgw/tasks/docker/pre_requisite.yml | 5 ++++-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/roles/ceph-mds/tasks/docker/pre_requisite.yml b/roles/ceph-mds/tasks/docker/pre_requisite.yml
index 895c5e956..e55176b87 100644
--- a/roles/ceph-mds/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-mds/tasks/docker/pre_requisite.yml
@@ -1,8 +1,11 @@
 ---
 - name: create mds bootstrap directory
   file:
-    path: /var/lib/ceph/bootstrap-mds
+    path: "{{ item }}"
     state: directory
+  with_items:
+    - /etc/ceph/
+    - /var/lib/ceph/bootstrap-mds
 
 # NOTE (leseb): for version 1.1.0 because https://github.com/ansible/ansible-modules-core/issues/1227
 - name: install docker-py
diff --git a/roles/ceph-mon/tasks/docker/pre_requisite.yml b/roles/ceph-mon/tasks/docker/pre_requisite.yml
index 112e5bfd7..56e4386a8 100644
--- a/roles/ceph-mon/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-mon/tasks/docker/pre_requisite.yml
@@ -1,12 +1,13 @@
 ---
 - name: create bootstrap directories
   file:
-    path: /var/lib/ceph/bootstrap-{{ item }}
+    path: "{{ item }}"
     state: directory
   with_items:
-    - osd
-    - mds
-    - rgw
+    - /etc/ceph/
+    - /var/lib/ceph/bootstrap-osd
+    - /var/lib/ceph/bootstrap-mds
+    - /var/lib/ceph/bootstrap-rgw
 
 # NOTE (leseb): for version 1.1.0 because https://github.com/ansible/ansible-modules-core/issues/1227
 - name: install docker-py
diff --git a/roles/ceph-osd/tasks/docker/pre_requisite.yml b/roles/ceph-osd/tasks/docker/pre_requisite.yml
index 274c5b953..e867af9fe 100644
--- a/roles/ceph-osd/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-osd/tasks/docker/pre_requisite.yml
@@ -1,8 +1,11 @@
 ---
 - name: create osd bootstrap directory
   file:
-    path: /var/lib/ceph/bootstrap-osd
+    path: "{{ item }}"
     state: directory
+  with_items:
+    - /etc/ceph/
+    - /var/lib/ceph/bootstrap-osd
 
 # NOTE (leseb): for version 1.1.0 because https://github.com/ansible/ansible-modules-core/issues/1227
 - name: install docker-py
diff --git a/roles/ceph-rgw/tasks/docker/pre_requisite.yml b/roles/ceph-rgw/tasks/docker/pre_requisite.yml
index ddd26ea7d..c845ae68c 100644
--- a/roles/ceph-rgw/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-rgw/tasks/docker/pre_requisite.yml
@@ -1,8 +1,11 @@
 ---
 - name: create rgw bootstrap directory
   file:
-    path: /var/lib/ceph/bootstrap-rgw
+    path: "{{ item }}"
     state: directory
+  with_items:
+    - /etc/ceph/
+    - /var/lib/ceph/bootstrap-rgw
 
 # NOTE (leseb): for version 1.1.0 because https://github.com/ansible/ansible-modules-core/issues/1227
 - name: install docker-py