config: only pre-create ceph dirs on containers

We don't need to create the directories on non-containers, they are
created by the packages.

Closes: https://github.com/ceph/ceph-ansible/issues/3430
Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml
index 3b87f44156fafc3062630ef25c77b0f2e766cc93..62fb1a2cfe3e77a39ec741521cccf8c89427bc77 100644 (file)
--- a/roles/ceph-config/tasks/main.yml
+++ b/roles/ceph-config/tasks/main.yml
@@ -1,7 +1,4 @@
 ---
-- name: include create_ceph_initial_dirs.yml
-  include_tasks: create_ceph_initial_dirs.yml
-
 # ceph-common
 - block:
   - name: create ceph conf directory
@@ -120,6 +117,9 @@
     - not containerized_deployment|bool
 
 - block:
+  - name: include create_ceph_initial_dirs.yml
+    include_tasks: create_ceph_initial_dirs.yml
+
   - name: create a local fetch directory if it does not exist
     file:
       path: "{{ fetch_directory }}"
@@ -155,14 +155,6 @@
     when:
       - generate_fsid
 
-  - name: ensure /etc/ceph exists
-    file:
-      path: /etc/ceph
-      state: directory
-      owner: "{{ ceph_uid }}"
-      group: "{{ ceph_uid }}"
-      mode: 0755
-
   - name: "generate {{ cluster }}.conf configuration file"
     action: config_template
     args: