Configurable Ceph Conf Directory Permissions

This change allows for configurable Ceph Conf Directory permissions. This
is required for integrators of Ceph, like OpenStack Cinder, which needs to
read from /etc/ceph for operation.

diff --git a/group_vars/all.sample b/group_vars/all.sample
index d8ea8642442b130c8911ced1d199c7b5623dbf5e..251cfb9abe0e79130cc9c48e61470652d13f4a75 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -10,6 +10,20 @@ dummy:
 
 #fetch_directory: fetch/
 
+###############
+# PERMISSIONS #
+###############
+
+# Permissions for /etc/ceph configuration directory
+#conf_directory_owner: root
+#conf_directory_group: root
+#conf_directory_mode: 644
+
+# Permissions for /etc/ceph/ceph.conf configuration file
+#conf_file_owner: root
+#conf_file_group: root
+#conf_file_mode: 644
+
 #########
 # INSTALL
 #########

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 6591fdc126b80258893c2c65703690e4093d8642..9dd187f7917c423827e31298265a37bc44c73b65 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -7,6 +7,20 @@
 \r
 fetch_directory: fetch/\r
 \r
+###############\r
+# PERMISSIONS #\r
+###############\r
+\r
+# Permissions for /etc/ceph configuration directory\r
+conf_directory_owner: root\r
+conf_directory_group: root\r
+conf_directory_mode: 644\r
+\r
+# Permissions for /etc/ceph/ceph.conf configuration file\r
+conf_file_owner: root\r
+conf_file_group: root\r
+conf_file_mode: 644\r
+\r
 ###########\r
 # INSTALL #\r
 ###########\r

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 5f404671be814ae648f5b612e53c48a29e02b19e..88b672cd905f74ddc4d5d52a696d693c0d2b2344 100644 (file)
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -82,17 +82,17 @@
   file:
       path: /etc/ceph
       state: directory
-      owner: root
-      group: root
-      mode: 0644
+      owner: "{{ conf_directory_owner }}"
+      group: "{{ conf_directory_group }}"
+      mode: "{{ conf_directory_mode }}"
 
 - name: generate ceph configuration file
   config_template:
     src: ceph.conf.j2
     dest: /etc/ceph/ceph.conf
-    owner: "root"
-    group: "root"
-    mode: "0644"
+    owner: "{{ conf_file_owner }}"
+    group: "{{ conf_file_group }}"
+    mode: "{{ conf_file_mode }}"
     config_overrides: "{{ ceph_conf_overrides }}"
     config_type: ini
   notify: