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 <gabrioux@redhat.com>
pull/4959/head
Guillaume Abrioux 2020-01-21 15:30:16 +01:00
parent f995b079a6
commit 483adb5d79
10 changed files with 12 additions and 12 deletions

View File

@ -115,7 +115,7 @@ dummy:
#upgrade_ceph_packages: False
#ceph_use_distro_backports: false # DEBIAN ONLY
#ceph_directories_mode: "0755"
###########
# INSTALL #

View File

@ -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 #

View File

@ -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

View File

@ -107,7 +107,7 @@ bootstrap_dirs_group: "64045"
upgrade_ceph_packages: False
ceph_use_distro_backports: false # DEBIAN ONLY
ceph_directories_mode: "0755"
###########
# INSTALL #

View File

@ -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 }}

View File

@ -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:

View File

@ -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

View File

@ -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 }}" }

View File

@ -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/

View File

@ -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