mirror of https://github.com/ceph/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 <gabrioux@redhat.com>pull/4959/head
parent
f995b079a6
commit
483adb5d79
|
@ -115,7 +115,7 @@ dummy:
|
||||||
#upgrade_ceph_packages: False
|
#upgrade_ceph_packages: False
|
||||||
|
|
||||||
#ceph_use_distro_backports: false # DEBIAN ONLY
|
#ceph_use_distro_backports: false # DEBIAN ONLY
|
||||||
|
#ceph_directories_mode: "0755"
|
||||||
|
|
||||||
###########
|
###########
|
||||||
# INSTALL #
|
# INSTALL #
|
||||||
|
|
|
@ -115,7 +115,7 @@ fetch_directory: ~/ceph-ansible-keys
|
||||||
#upgrade_ceph_packages: False
|
#upgrade_ceph_packages: False
|
||||||
|
|
||||||
#ceph_use_distro_backports: false # DEBIAN ONLY
|
#ceph_use_distro_backports: false # DEBIAN ONLY
|
||||||
|
#ceph_directories_mode: "0755"
|
||||||
|
|
||||||
###########
|
###########
|
||||||
# INSTALL #
|
# INSTALL #
|
||||||
|
|
|
@ -95,7 +95,7 @@
|
||||||
state: directory
|
state: directory
|
||||||
owner: "ceph"
|
owner: "ceph"
|
||||||
group: "ceph"
|
group: "ceph"
|
||||||
mode: "{{ ceph_directories_mode | default('0755') }}"
|
mode: "{{ ceph_directories_mode }}"
|
||||||
|
|
||||||
- name: "generate ceph configuration file: {{ cluster }}.conf"
|
- name: "generate ceph configuration file: {{ cluster }}.conf"
|
||||||
action: config_template
|
action: config_template
|
||||||
|
@ -122,7 +122,7 @@
|
||||||
file:
|
file:
|
||||||
path: "{{ fetch_directory }}/{{ fsid }}/etc/ceph"
|
path: "{{ fetch_directory }}/{{ fsid }}/etc/ceph"
|
||||||
state: directory
|
state: directory
|
||||||
mode: "{{ ceph_directories_mode | default('0755') }}"
|
mode: "{{ ceph_directories_mode }}"
|
||||||
delegate_to: localhost
|
delegate_to: localhost
|
||||||
when: ceph_conf_local | bool
|
when: ceph_conf_local | bool
|
||||||
|
|
||||||
|
|
|
@ -107,7 +107,7 @@ bootstrap_dirs_group: "64045"
|
||||||
upgrade_ceph_packages: False
|
upgrade_ceph_packages: False
|
||||||
|
|
||||||
ceph_use_distro_backports: false # DEBIAN ONLY
|
ceph_use_distro_backports: false # DEBIAN ONLY
|
||||||
|
ceph_directories_mode: "0755"
|
||||||
|
|
||||||
###########
|
###########
|
||||||
# INSTALL #
|
# INSTALL #
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
state: directory
|
state: directory
|
||||||
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
||||||
group: "{{ 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:
|
with_items:
|
||||||
- /var/lib/ceph/bootstrap-mds/
|
- /var/lib/ceph/bootstrap-mds/
|
||||||
- /var/lib/ceph/mds/{{ cluster }}-{{ mds_name }}
|
- /var/lib/ceph/mds/{{ cluster }}-{{ mds_name }}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
state: directory
|
state: directory
|
||||||
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
||||||
group: "{{ 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
|
- name: fetch ceph mgr keyring
|
||||||
ceph_key:
|
ceph_key:
|
||||||
|
|
|
@ -56,7 +56,7 @@
|
||||||
state: directory
|
state: directory
|
||||||
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
||||||
group: "{{ 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
|
recurse: true
|
||||||
|
|
||||||
- name: create custom admin keyring
|
- name: create custom admin keyring
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
state: directory
|
state: directory
|
||||||
owner: "ceph"
|
owner: "ceph"
|
||||||
group: "ceph"
|
group: "ceph"
|
||||||
mode: "{{ ceph_directories_mode | default('0755') }}"
|
mode: "{{ ceph_directories_mode }}"
|
||||||
with_items:
|
with_items:
|
||||||
- { name: "/var/lib/ceph/bootstrap-rgw", create: "{{ nfs_obj_gw }}" }
|
- { name: "/var/lib/ceph/bootstrap-rgw", create: "{{ nfs_obj_gw }}" }
|
||||||
- { name: "/var/lib/ceph/radosgw", create: "{{ nfs_obj_gw }}" }
|
- { name: "/var/lib/ceph/radosgw", create: "{{ nfs_obj_gw }}" }
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
state: directory
|
state: directory
|
||||||
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
||||||
group: "{{ 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
|
when: cephx | bool
|
||||||
with_items:
|
with_items:
|
||||||
- /var/lib/ceph/bootstrap-osd/
|
- /var/lib/ceph/bootstrap-osd/
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
state: directory
|
state: directory
|
||||||
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
||||||
group: "{{ 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 }}"
|
with_items: "{{ rbd_client_admin_socket_path }}"
|
||||||
|
|
||||||
- name: create rados gateway instance directories
|
- name: create rados gateway instance directories
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
state: directory
|
state: directory
|
||||||
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
||||||
group: "{{ 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 }}"
|
with_items: "{{ rgw_instances }}"
|
||||||
when: rgw_instances is defined
|
when: rgw_instances is defined
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue