common: add a default value for ceph_directories_mode

Since this variable makes it possible to customize the mode for ceph
directories, let's make it a bit more explicit by adding a default value
in ceph-defaults.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 483adb5d79)

group_vars/all.yml.sample

@@ -106,7 +106,7 @@ dummy:
 #upgrade_ceph_packages: False
 
 #ceph_use_distro_backports: false # DEBIAN ONLY
-
+#ceph_directories_mode: "0755"
 
 ###########
 # INSTALL #

group_vars/rhcs.yml.sample

@@ -106,7 +106,7 @@ fetch_directory: ~/ceph-ansible-keys
 #upgrade_ceph_packages: False
 
 #ceph_use_distro_backports: false # DEBIAN ONLY
-
+#ceph_directories_mode: "0755"
 
 ###########
 # INSTALL #

roles/ceph-config/tasks/main.yml

@@ -97,7 +97,7 @@
       state: directory
       owner: "ceph"
       group: "ceph"
-      mode: "{{ ceph_directories_mode | default('0755') }}"
+      mode: "{{ ceph_directories_mode }}"
 
   - name: "generate ceph configuration file: {{ cluster }}.conf"
     action: config_template
@@ -124,7 +124,7 @@
     file:
       path: "{{ fetch_directory }}/{{ fsid }}/etc/ceph"
       state: directory
-      mode: "{{ ceph_directories_mode | default('0755') }}"
+      mode: "{{ ceph_directories_mode }}"
     delegate_to: localhost
     when: ceph_conf_local | bool
 

roles/ceph-defaults/defaults/main.yml

@@ -98,7 +98,7 @@ ntp_daemon_type: chronyd
 upgrade_ceph_packages: False
 
 ceph_use_distro_backports: false # DEBIAN ONLY
-
+ceph_directories_mode: "0755"
 
 ###########
 # INSTALL #

roles/ceph-mds/tasks/common.yml

@@ -5,7 +5,7 @@
     state: directory
     owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
     group: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
-    mode: "{{ ceph_directories_mode | default('0755') }}"
+    mode: "{{ ceph_directories_mode }}"
   with_items:
     - /var/lib/ceph/bootstrap-mds/
     - /var/lib/ceph/mds/{{ cluster }}-{{ mds_name }}

roles/ceph-mgr/tasks/common.yml

@@ -5,7 +5,7 @@
     state: directory
     owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
     group: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
-    mode: "{{ ceph_directories_mode | default('0755') }}"
+    mode: "{{ ceph_directories_mode }}"
 
 - name: fetch ceph mgr keyring
   ceph_key:

roles/ceph-mon/tasks/deploy_monitors.yml

@@ -57,7 +57,7 @@
     state: directory
     owner: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
     group: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
-    mode: "{{ ceph_directories_mode | default('0755') }}"
+    mode: "{{ ceph_directories_mode }}"
 
 # We don't do the recursion in the task above to avoid setting `mode` (which
 # defaults to 0755) on files.

roles/ceph-nfs/tasks/pre_requisite_non_container.yml

@@ -31,7 +31,7 @@
     state: directory
     owner: "ceph"
     group: "ceph"
-    mode: "{{ ceph_directories_mode | default('0755') }}"
+    mode: "{{ ceph_directories_mode }}"
   with_items:
     - { name: "/var/lib/ceph/bootstrap-rgw", create: "{{ nfs_obj_gw }}" }
     - { name: "/var/lib/ceph/radosgw", create: "{{ nfs_obj_gw }}" }

roles/ceph-osd/tasks/common.yml

@@ -5,7 +5,7 @@
     state: directory
     owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
     group: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
-    mode: "{{ ceph_directories_mode | default('0755') }}"
+    mode: "{{ ceph_directories_mode }}"
   when: cephx | bool
   with_items:
     - /var/lib/ceph/bootstrap-osd/

roles/ceph-rgw/tasks/common.yml

@@ -5,7 +5,7 @@
     state: directory
     owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
     group: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
-    mode: "{{ ceph_directories_mode | default('0755') }}"
+    mode: "{{ ceph_directories_mode }}"
   with_items: "{{ rbd_client_admin_socket_path }}"
 
 - name: get keys from monitors