mirror of https://github.com/ceph/ceph-ansible.git
rbd-mirror: follow up on recent rbd-mirror refactor
- ensure /var/lib/ceph/bootstrap-rbd-mirror exists - always install ceph-base on rbdmirror nodes (otherwise, ceph-crash isn't present) Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>BZ211101-limit-mds
parent
7a2f1136cb
commit
cca694aa8b
|
@ -10,6 +10,7 @@ debian_ceph_pkgs:
|
|||
- "{{ (ceph_test | bool) | ternary('ceph-test', 'ceph-common') }}"
|
||||
- "{{ (rgw_group_name in group_names) | ternary('radosgw', 'ceph-common') }}"
|
||||
- "{{ ((ceph_repository == 'rhcs') and (client_group_name in group_names)) | ternary('ceph-fuse', 'ceph-common') }}"
|
||||
- "{{ (rbdmirror_group_name in group_names) | ternary('ceph-base', 'ceph-common') }}"
|
||||
|
||||
redhat_ceph_pkgs:
|
||||
- "{{ (ceph_test | bool) | ternary('ceph-test', 'ceph-common') }}"
|
||||
|
@ -20,6 +21,7 @@ redhat_ceph_pkgs:
|
|||
- "{{ (client_group_name in group_names) | ternary('ceph-fuse', 'ceph-common') }}"
|
||||
- "{{ (client_group_name in group_names) | ternary('ceph-base', 'ceph-common') }}"
|
||||
- "{{ (rgw_group_name in group_names) | ternary('ceph-radosgw', 'ceph-common') }}"
|
||||
- "{{ (rbdmirror_group_name in group_names) | ternary('ceph-base', 'ceph-common') }}"
|
||||
|
||||
suse_ceph_pkgs:
|
||||
- "{{ (ceph_test | bool) | ternary('ceph-test', 'ceph-common') }}"
|
||||
|
@ -30,3 +32,4 @@ suse_ceph_pkgs:
|
|||
- "{{ (client_group_name in group_names) | ternary('ceph-fuse', 'ceph-common') }}"
|
||||
- "{{ (client_group_name in group_names) | ternary('ceph-base', 'ceph-common') }}"
|
||||
- "{{ (rgw_group_name in group_names) | ternary('ceph-radosgw', 'ceph-common') }}"
|
||||
- "{{ (rbdmirror_group_name in group_names) | ternary('ceph-base', 'ceph-common') }}"
|
||||
|
|
|
@ -17,6 +17,13 @@
|
|||
run_once: true
|
||||
no_log: "{{ no_log_on_ceph_key_tasks }}"
|
||||
|
||||
- name: ensure /var/lib/ceph/bootstrap-rbd-mirror exists
|
||||
file:
|
||||
path: /var/lib/ceph/bootstrap-rbd-mirror
|
||||
state: directory
|
||||
owner: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
|
||||
group: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
|
||||
|
||||
- name: copy ceph key(s)
|
||||
copy:
|
||||
dest: "/var/lib/ceph/bootstrap-rbd-mirror/{{ cluster }}.keyring"
|
||||
|
|
|
@ -4,14 +4,6 @@
|
|||
- not containerized_deployment | bool
|
||||
- ceph_rbd_mirror_remote_user is defined
|
||||
block:
|
||||
- name: install dependencies
|
||||
package:
|
||||
name: rbd-mirror
|
||||
state: present
|
||||
register: result
|
||||
until: result is succeeded
|
||||
tags: package-install
|
||||
|
||||
- name: ensure systemd service override directory exists
|
||||
file:
|
||||
state: directory
|
||||
|
|
Loading…
Reference in New Issue