ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
pull/7272/head
Guillaume Abrioux 2022-08-01 20:18:50 +02:00
parent 7a2f1136cb
commit bb4f8dd667
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
View File

@ -565,11 +565,17 @@
serial: 1 serial: 1
become: true become: true
pre_tasks: pre_tasks:
- name: check for ceph rbd mirror services
command: systemctl show --no-pager --property=Id --state=enabled ceph-rbd-mirror@* # noqa 303
changed_when: false
register: rbdmirror_services
- name: stop non-containerized ceph rbd mirror(s) - name: stop non-containerized ceph rbd mirror(s)
service: service:
name: "ceph-rbd-mirror@rbd-mirror.{{ ansible_facts['hostname'] }}" name: "{{ item.split('=')[1] }}"
state: stopped state: stopped
enabled: no enabled: no
loop: "{{ rbdmirror_services.stdout_lines }}"
- name: remove old systemd unit files - name: remove old systemd unit files
file: file:

3
roles/ceph-common/vars/main.yml
View File

@ -10,6 +10,7 @@ debian_ceph_pkgs:
- "{{ (ceph_test | bool) | ternary('ceph-test', 'ceph-common') }}" - "{{ (ceph_test | bool) | ternary('ceph-test', 'ceph-common') }}"
- "{{ (rgw_group_name in group_names) | ternary('radosgw', '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') }}" - "{{ ((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: redhat_ceph_pkgs:
- "{{ (ceph_test | bool) | ternary('ceph-test', 'ceph-common') }}" - "{{ (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-fuse', 'ceph-common') }}"
- "{{ (client_group_name in group_names) | ternary('ceph-base', 'ceph-common') }}" - "{{ (client_group_name in group_names) | ternary('ceph-base', 'ceph-common') }}"
- "{{ (rgw_group_name in group_names) | ternary('ceph-radosgw', '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: suse_ceph_pkgs:
- "{{ (ceph_test | bool) | ternary('ceph-test', 'ceph-common') }}" - "{{ (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-fuse', 'ceph-common') }}"
- "{{ (client_group_name in group_names) | ternary('ceph-base', 'ceph-common') }}" - "{{ (client_group_name in group_names) | ternary('ceph-base', 'ceph-common') }}"
- "{{ (rgw_group_name in group_names) | ternary('ceph-radosgw', 'ceph-common') }}" - "{{ (rgw_group_name in group_names) | ternary('ceph-radosgw', 'ceph-common') }}"
- "{{ (rbdmirror_group_name in group_names) | ternary('ceph-base', 'ceph-common') }}"

7
roles/ceph-rbd-mirror/tasks/configure_mirroring.yml
View File

@ -17,6 +17,13 @@
run_once: true run_once: true
no_log: "{{ no_log_on_ceph_key_tasks }}" 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) - name: copy ceph key(s)
copy: copy:
dest: "/var/lib/ceph/bootstrap-rbd-mirror/{{ cluster }}.keyring" dest: "/var/lib/ceph/bootstrap-rbd-mirror/{{ cluster }}.keyring"