From: Sébastien Han <seb@redhat.com>
Date: Mon, 29 Feb 2016 10:10:56 +0000 (+0100)
Subject: ceph-common: use saner defaults for ceph dir
X-Git-Tag: v1.0.0~16^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e14b47174d08b72837acf61bee4bdba240e4ca0;p=ceph-ansible.git

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 a7fd24672..9b6d4cdcb 100644
--- 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 43a73f68c..ecaf45d59 100644
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -7,20 +7,6 @@
 
 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/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index b795bce6b..ec9d4afe7 100644
--- 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: