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 483adb5d790ea74db01154b7dacbbf2bef030acc)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index b5f9765b17f6a53632af88a01857466082964ffc..7c0b126ccc51ab7830542184ded3ce7a0ce25837 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/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 #

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 47abf5680a76c083e57d46631a4f8d052854e3a2..eed965af7279465359ee1511dc1799de48acd7d9 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/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 #

diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml
index 20fa9832c56a77fc12d4b75f3c0c6241a57948d4..bd8714f991af94b9cc68a28d1b5a5708ef713f3c 100644 (file)
--- a/roles/ceph-config/tasks/main.yml
+++ b/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
 

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 19bf2395469caac4f2b30c085fbfb4b462025549..75cf0da867e759b693f348ee33db83de1e680bb8 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/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 #

diff --git a/roles/ceph-mds/tasks/common.yml b/roles/ceph-mds/tasks/common.yml
index ddfc78f39b59bac621a517d5a0aed449e4293912..c9df2017dd6caa8eac65b9ba7fc38d2c8f96953c 100644 (file)
--- a/roles/ceph-mds/tasks/common.yml
+++ b/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 }}

diff --git a/roles/ceph-mgr/tasks/common.yml b/roles/ceph-mgr/tasks/common.yml
index b3cd93e00ca451cecc0bbc832f16072f8693cbc5..ae47440344890fc764da91d13b54054840ab1a08 100644 (file)
--- a/roles/ceph-mgr/tasks/common.yml
+++ b/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:

diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml
index 10c9357f3243d87d585cd29b876871aca6d7075c..5ede5f6317b7430067017e5f290e4c9f5886bb58 100644 (file)
--- a/roles/ceph-mon/tasks/deploy_monitors.yml
+++ b/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.

diff --git a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml
index 134a7d002bbd6058ad977b575d1a7e704f0da32e..69efda56ba278c455b6914c2bb90b2712184caf5 100644 (file)
--- a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml
+++ b/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 }}" }

diff --git a/roles/ceph-osd/tasks/common.yml b/roles/ceph-osd/tasks/common.yml
index 5bd7964a562e4ed64f06ebe84022be53c62f57ea..989830952f0bdd92043353c4e919c87994b7bcf5 100644 (file)
--- a/roles/ceph-osd/tasks/common.yml
+++ b/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/

diff --git a/roles/ceph-rgw/tasks/common.yml b/roles/ceph-rgw/tasks/common.yml
index 5b06e086cae2323124c2acb5b13380c069e67e9f..50e4a6f275ec9e30a6d744f3b7c52b7d6edecc87 100644 (file)
--- a/roles/ceph-rgw/tasks/common.yml
+++ b/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