move create ceph initial directories to default

This is needed for both non-container and container deployments.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-common/tasks/create_ceph_initial_dirs.yml b/roles/ceph-common/tasks/create_ceph_initial_dirs.yml
deleted file mode 100644 (file)
index 46682b6..0000000
--- a/roles/ceph-common/tasks/create_ceph_initial_dirs.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: create ceph initial directories
-  file:
-    path: "{{ item }}"
-    state: directory
-    owner: ceph
-    group: ceph
-    mode: 0755
-  with_items:
-    - /etc/ceph
-    - /var/lib/ceph/
-    - /var/lib/ceph/mon
-    - /var/lib/ceph/osd
-    - /var/lib/ceph/mds
-    - /var/lib/ceph/tmp
-    - /var/lib/ceph/radosgw
-    - /var/lib/ceph/bootstrap-rgw
-    - /var/lib/ceph/bootstrap-mds
-    - /var/lib/ceph/bootstrap-osd
-    - /var/lib/ceph/bootstrap-rbd

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 79ae3b3069de08c6387dcfceec52a31958c6beca..7c5a78bcb337a270b74f52a257f3b4c17006aa3c 100644 (file)
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -98,9 +98,6 @@
     - ceph_current_fsid.rc == 0
     - mon_group_name in group_names
 
-- name: include create_ceph_initial_dirs.yml
-  include: create_ceph_initial_dirs.yml
-
 - name: include create_rbd_client_dir.yml
   include: create_rbd_client_dir.yml
 

diff --git a/roles/ceph-defaults/tasks/create_ceph_initial_dirs.yml b/roles/ceph-defaults/tasks/create_ceph_initial_dirs.yml
new file mode 100644 (file)
index 0000000..e53fc2a
--- /dev/null
+++ b/roles/ceph-defaults/tasks/create_ceph_initial_dirs.yml
@@ -0,0 +1,25 @@
+---
+- name: set_fact ceph_directories
+  set_fact:
+    ceph_directories:
+      - /etc/ceph
+      - /var/lib/ceph/
+      - /var/lib/ceph/mon
+      - /var/lib/ceph/osd
+      - /var/lib/ceph/mds
+      - /var/lib/ceph/tmp
+      - /var/lib/ceph/radosgw
+      - /var/lib/ceph/bootstrap-rgw
+      - /var/lib/ceph/bootstrap-mds
+      - /var/lib/ceph/bootstrap-osd
+      - /var/lib/ceph/bootstrap-rbd
+      - /var/run/ceph
+
+- name: create ceph initial directories
+  file:
+    path: "{{ item }}"
+    state: directory
+    owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
+    group: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
+    mode: 0755
+  with_items: "{{ ceph_directories }}"

diff --git a/roles/ceph-defaults/tasks/main.yml b/roles/ceph-defaults/tasks/main.yml
index 7a2b6d7450f0b36c610049cc3171b2f867f6093e..112c37c7709d11f18c9ec9e6fe6d0d71f21f816e 100644 (file)
--- a/roles/ceph-defaults/tasks/main.yml
+++ b/roles/ceph-defaults/tasks/main.yml
@@ -4,3 +4,6 @@
 
 - name: include facts.yml
   include: facts.yml
+
+- name: include create_ceph_initial_dirs.yml
+  include: create_ceph_initial_dirs.yml
\ No newline at end of file