From 8b284d4356111a8f012ef02af20e651add70d7f0 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 28 Apr 2021 15:11:25 +0200 Subject: [PATCH] cephadm_adopt: fix ceph-crash migration ceph-ansible leaves a ceph-crash container in containerized deployment. It means we end up with 2 ceph-crash containers running after the migration playbook is complete. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1954614 Signed-off-by: Guillaume Abrioux (cherry picked from commit 22c18e82f0340bcc63bba7f124cda8e04874b30b) --- infrastructure-playbooks/cephadm-adopt.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index 84833513fa..67bbf996df 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -812,11 +812,10 @@ - name: stop and disable ceph-crash systemd service service: - name: ceph-crash + name: "{{ 'ceph-crash@' + ansible_facts['hostname'] if containerized_deployment | bool else 'ceph-crash.service' }}" state: stopped enabled: false failed_when: false - when: not containerized_deployment | bool - name: update the placement of ceph-crash hosts command: "{{ cephadm_cmd }} shell --fsid {{ fsid }} -- ceph --cluster {{ cluster }} orch apply crash --placement='label:ceph'"