ceph-common: use saner defaults for ceph dir

re-use the logic introduced in #512 for the ceph directory and the
`ceph.conf` file.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/group_vars/all.sample b/group_vars/all.sample
index a7fd246729d7b152ec88fb1da04582605aed92f5..9b6d4cdcbee5a015cd37239d094bd16c9f8240c8 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -10,20 +10,6 @@ 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 43a73f68cb5f85f400769967d9ee9d55d50790cb..ecaf45d5995b89ee8d7df9ef017927abd5d0a1ce 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -7,20 +7,6 @@
 \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 b795bce6bd7f40673f9fea969b1bdd32084f189c..ec9d4afe718db20965fa64fe80bd2aa76eda7803 100644 (file)
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -142,18 +142,18 @@
   file:
     path: /etc/ceph
     state: directory
-    owner: "{{ conf_directory_owner }}"
-    group: "{{ conf_directory_group }}"
-    mode: "{{ conf_directory_mode }}"
+    owner: "{{ dir_owner }}"
+    group: "{{ dir_group }}"
+    mode: "{{ dir_mode }}"
 
 - name: generate ceph configuration file
   action: config_template
   args:
     src: ceph.conf.j2
     dest: /etc/ceph/ceph.conf
-    owner: "{{ conf_file_owner }}"
-    group: "{{ conf_file_group }}"
-    mode: "{{ conf_file_mode }}"
+    owner: "{{ dir_owner }}"
+    group: "{{ dir_group }}"
+    mode: "{{ activate_file_mode }}"
     config_overrides: "{{ ceph_conf_overrides }}"
     config_type: ini
   notify: