From 011270ca698ddf9602b8fe52d4e3b98f6b06155d Mon Sep 17 00:00:00 2001 From: Artur Fijalkowski Date: Wed, 1 Aug 2018 14:37:40 +0200 Subject: [PATCH] global: make directories mode parameterizable This commit makes it possible to parametrize the ceph directories modes. So it changes hardocded mode for ceph related directories from 0755 to customizable with `ceph_directories_mode` variable. Closes: #2920 Signed-off-by: Artur Fijalkowski Co-authored-by: Guillaume Abrioux --- roles/ceph-config/tasks/main.yml | 4 ++-- roles/ceph-mds/tasks/common.yml | 2 +- roles/ceph-mgr/tasks/common.yml | 2 +- roles/ceph-mon/tasks/deploy_monitors.yml | 2 +- roles/ceph-nfs/tasks/pre_requisite_non_container.yml | 2 +- roles/ceph-osd/tasks/common.yml | 2 +- roles/ceph-rgw/tasks/common.yml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml index 0a1c7cb1d..f6bbd7462 100644 --- a/roles/ceph-config/tasks/main.yml +++ b/roles/ceph-config/tasks/main.yml @@ -72,7 +72,7 @@ state: directory owner: "ceph" group: "ceph" - mode: "0755" + mode: "{{ ceph_directories_mode | default('0755') }}" - name: "generate ceph configuration file: {{ cluster }}.conf" action: config_template @@ -98,7 +98,7 @@ file: path: "{{ fetch_directory }}/{{ fsid }}/etc/ceph" state: directory - mode: "0755" + mode: "{{ ceph_directories_mode | default('0755') }}" delegate_to: localhost when: ceph_conf_local | bool diff --git a/roles/ceph-mds/tasks/common.yml b/roles/ceph-mds/tasks/common.yml index b99b0610f..e32595d8d 100644 --- 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: "0755" + mode: "{{ ceph_directories_mode | default('0755') }}" 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 cee9f8e8b..068caf509 100644 --- 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: "0755" + mode: "{{ ceph_directories_mode | default('0755') }}" - 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 893ddde48..0dfeacec4 100644 --- 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: "u=rwX,g=rX,o=rX" + mode: "{{ ceph_directories_mode | default('0755') }}" 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 86d3a12a6..5452f541d 100644 --- 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: "0755" + mode: "{{ ceph_directories_mode | default('0755') }}" 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 9fa777c39..644c60ccc 100644 --- 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: "0755" + mode: "{{ ceph_directories_mode | default('0755') }}" 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 be5f24ee9..33dc14448 100644 --- 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: "0755" + mode: "{{ ceph_directories_mode | default('0755') }}" 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: "0755" + mode: "{{ ceph_directories_mode | default('0755') }}" with_items: "{{ rgw_instances }}" when: rgw_instances is defined -- 2.39.5