From: Guillaume Abrioux Date: Tue, 21 Jan 2020 14:30:16 +0000 (+0100) Subject: common: add a default value for ceph_directories_mode X-Git-Tag: v6.0.0alpha1~100 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=483adb5d790ea74db01154b7dacbbf2bef030acc;p=ceph-ansible.git common: add a default value for ceph_directories_mode Since this variable makes it possible to customize the mode for ceph directories, let's make it a bit more explicit by adding a default value in ceph-defaults. Signed-off-by: Guillaume Abrioux --- diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 1c3b5d535..6bd2d6a8f 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -115,7 +115,7 @@ dummy: #upgrade_ceph_packages: False #ceph_use_distro_backports: false # DEBIAN ONLY - +#ceph_directories_mode: "0755" ########### # INSTALL # diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index fce80019d..4ee2a5587 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -115,7 +115,7 @@ fetch_directory: ~/ceph-ansible-keys #upgrade_ceph_packages: False #ceph_use_distro_backports: false # DEBIAN ONLY - +#ceph_directories_mode: "0755" ########### # INSTALL # diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml index 7df8d17aa..8a212407f 100644 --- a/roles/ceph-config/tasks/main.yml +++ b/roles/ceph-config/tasks/main.yml @@ -95,7 +95,7 @@ state: directory owner: "ceph" group: "ceph" - mode: "{{ ceph_directories_mode | default('0755') }}" + mode: "{{ ceph_directories_mode }}" - name: "generate ceph configuration file: {{ cluster }}.conf" action: config_template @@ -122,7 +122,7 @@ file: path: "{{ fetch_directory }}/{{ fsid }}/etc/ceph" state: directory - mode: "{{ ceph_directories_mode | default('0755') }}" + mode: "{{ ceph_directories_mode }}" delegate_to: localhost when: ceph_conf_local | bool diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 233d65285..8eb3f737e 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -107,7 +107,7 @@ bootstrap_dirs_group: "64045" upgrade_ceph_packages: False ceph_use_distro_backports: false # DEBIAN ONLY - +ceph_directories_mode: "0755" ########### # INSTALL # diff --git a/roles/ceph-mds/tasks/common.yml b/roles/ceph-mds/tasks/common.yml index ddfc78f39..c9df2017d 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: "{{ ceph_directories_mode | default('0755') }}" + mode: "{{ ceph_directories_mode }}" 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 193b72f27..fac0a7ff0 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: "{{ ceph_directories_mode | default('0755') }}" + mode: "{{ ceph_directories_mode }}" - 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 e9cce2c50..6edd76858 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: "{{ ceph_directories_mode | default('0755') }}" + mode: "{{ ceph_directories_mode }}" 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 c02285307..15c66cc91 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: "{{ ceph_directories_mode | default('0755') }}" + mode: "{{ ceph_directories_mode }}" 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 ca5a210b3..7f7944ab8 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: "{{ ceph_directories_mode | default('0755') }}" + mode: "{{ ceph_directories_mode }}" 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 a33e0ab96..dbf80a005 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: "{{ ceph_directories_mode | default('0755') }}" + mode: "{{ ceph_directories_mode }}" 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: "{{ ceph_directories_mode | default('0755') }}" + mode: "{{ ceph_directories_mode }}" with_items: "{{ rgw_instances }}" when: rgw_instances is defined