From: Dimitri Savineau <dsavinea@redhat.com>
Date: Mon, 27 Jan 2020 14:36:56 +0000 (-0500)
Subject: filestore-to-bluestore: fix undefine osd_fsid_list
X-Git-Tag: v4.0.14~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f982a70f02839155fecd0acf3ba94d739ebd3fa1;p=ceph-ansible.git

filestore-to-bluestore: fix undefine osd_fsid_list

If the playbook is used on a host running bluestore OSDs then the
osd_fsid_list won't be filled because the bluestore OSDs are reported
with 'type: block' via ceph-volume lvm list command but we are looking
for 'type: data' (filestore).

TASK [zap ceph-volume prepared OSDs] *********
fatal: [xxxxx]: FAILED! =>
  msg: '''osd_fsid_list'' is undefined

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

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit cd76054f76fa4ce618335a3693c6c0f95d9209e6)
---

diff --git a/infrastructure-playbooks/filestore-to-bluestore.yml b/infrastructure-playbooks/filestore-to-bluestore.yml
index b1b308019..391d63fc7 100644
--- a/infrastructure-playbooks/filestore-to-bluestore.yml
+++ b/infrastructure-playbooks/filestore-to-bluestore.yml
@@ -195,6 +195,7 @@
             CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
             CEPH_CONTAINER_BINARY: "{{ container_binary }}"
           loop: "{{ osd_fsid_list }}"
+          when: osd_fsid_list is defined
 
         - name: ensure all dm are closed
           command: dmsetup remove "{{ item['lv_path'] }}"