Merge pull request #422 from ceph/docker-ceph-dirs

Create missing directories when deploying with docker

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

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

roles/ceph-osd/tasks/docker/fetch_configs.yml

@@ -15,7 +15,7 @@
 
 - name: try to fetch ceph config and keys
   copy:
-    src=: "{ fetch_directory }}/docker_mon_files/{{ item.0 }}"
+    src: "{{ fetch_directory }}/docker_mon_files/{{ item.0 }}"
     dest: "{{ item.0 }}"
     owner: root
     group: root

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

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