From 4e14b47174d08b72837acf61bee4bdba240e4ca0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Mon, 29 Feb 2016 11:10:56 +0100 Subject: [PATCH] ceph-common: use saner defaults for ceph dir MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit re-use the logic introduced in #512 for the ceph directory and the `ceph.conf` file. Signed-off-by: Sébastien Han --- group_vars/all.sample | 14 -------------- roles/ceph-common/defaults/main.yml | 14 -------------- roles/ceph-common/tasks/main.yml | 12 ++++++------ 3 files changed, 6 insertions(+), 34 deletions(-) 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: -- 2.39.5