From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 18 Aug 2020 18:35:17 +0000 (+0200)
Subject: shrink-mds: use mds_to_kill_hostname instead
X-Git-Tag: v4.0.29~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c7f6d15793b2651e4db45a09d36decd636662efe;p=ceph-ansible.git

shrink-mds: use mds_to_kill_hostname instead

When using fqdn in inventory host file, this task will fail because the
mds is registered with its shortname.

It means we must use `mds_to_kill_hostname` in this task.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1869837

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 51c382677dfa5db8fc39ca9c3c4898e017f3c189)
---

diff --git a/infrastructure-playbooks/shrink-mds.yml b/infrastructure-playbooks/shrink-mds.yml
index 8190aa9d6..6f5cdc733 100644
--- a/infrastructure-playbooks/shrink-mds.yml
+++ b/infrastructure-playbooks/shrink-mds.yml
@@ -78,9 +78,9 @@
   tasks:
     # get rid of this as soon as "systemctl stop ceph-msd@$HOSTNAME" also
     # removes the MDS from the FS map.
-    - name: exit mds if it the deployment is containerized
+    - name: exit mds when containerized deployment
+      command: "{{ container_exec_cmd | default('') }} ceph tell mds.{{ mds_to_kill_hostname }} exit"
       when: containerized_deployment | bool
-      command: "{{ container_exec_cmd | default('') }} ceph tell mds.{{ mds_to_kill }} exit"
 
     - name: get ceph status
       command: "{{ container_exec_cmd | default('') }} ceph --cluster {{ cluster }} -s -f json"