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>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 1c3b5d5353a302dc9c866781ffb5d4542a6cbf27..6bd2d6a8f313ee39f1a25d45d852af883644a73d 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -115,7 +115,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 fce80019d49f6cca7ebf57807240dffb62dfd587..4ee2a5587613ab71b9d82d8e7ee4c237dd51d657 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -115,7 +115,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 7df8d17aadfdee9fb6bd3b3fb13a228803856cf3..8a212407f1e9e188a9b543b3ab590f4c94e06a92 100644 (file)
--- a/roles/ceph-config/tasks/main.yml
+++ b/roles/ceph-config/tasks/main.yml
@@ -95,7 +95,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
@@ -122,7 +122,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 233d652853725f0909c96c07a6549dd428918c94..8eb3f737e7609a8521367819748bf236ee294d13 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -107,7 +107,7 @@ bootstrap_dirs_group: "64045"
 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 193b72f27d781c3c5412f94728c7bb97074f7851..fac0a7ff08543afc943e15e90e363b87213b6e4c 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 e9cce2c50fa3f2b3607bef2c7d31a4a6030edabb..6edd7685834503f48a9b1f0d46cbd430a7934519 100644 (file)
--- a/roles/ceph-mon/tasks/deploy_monitors.yml
+++ b/roles/ceph-mon/tasks/deploy_monitors.yml
@@ -56,7 +56,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 }}"
     recurse: true
 
 - name: create custom admin keyring

diff --git a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml
index c02285307e8f6483c87f5acfc13688e5a7bd60e6..15c66cc9196c8c6d6fcdb9c55ae9fe4d697722f8 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 ca5a210b34f2333bdf448ca11b5a5d347c28c1b2..7f7944ab8916f3baaddfe25d3f36a2feaa6d14e2 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 a33e0ab96d5aa055e49857e00b3c663fc28ba846..dbf80a0053eb7fffa32d4c045f609019cae95b44 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: create rados gateway instance directories
@@ -14,7 +14,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: "{{ rgw_instances }}"
   when: rgw_instances is defined