From: Dimitri Savineau <dsavinea@redhat.com>
Date: Thu, 30 Jul 2020 13:54:33 +0000 (-0400)
Subject: docker2podman: set disk_list for non lvm scenario
X-Git-Tag: v3.2.47
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=70469a69e49438661d6c1c2a3c5ab934ae9f0f71;p=ceph-ansible.git

docker2podman: set disk_list for non lvm scenario

When using non lvm scenarios (collocated or non-collocated) then the
disk_list variable isn't set because this is done during the ceph-osd
role (start_osds.yml) which isn't executed in the docker2podman
playbook.

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

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---

diff --git a/infrastructure-playbooks/docker-to-podman.yml b/infrastructure-playbooks/docker-to-podman.yml
index cdac741a0..3341a6f88 100644
--- a/infrastructure-playbooks/docker-to-podman.yml
+++ b/infrastructure-playbooks/docker-to-podman.yml
@@ -97,6 +97,14 @@
         tasks_from: systemd.yml
       when: inventory_hostname in groups.get(nfs_group_name, [])
 
+    - name: set_fact disk_list
+      set_fact:
+        disk_list:
+          rc: 0
+      when:
+        - inventory_hostname in groups.get(osd_group_name, [])
+        - osd_scenario != 'lvm'
+
     - import_role:
         name: ceph-osd
         tasks_from: systemd.yml
diff --git a/tests/functional/docker2podman/group_vars/osds b/tests/functional/docker2podman/group_vars/osds
deleted file mode 100644
index db8a552cd..000000000
--- a/tests/functional/docker2podman/group_vars/osds
+++ /dev/null
@@ -1,7 +0,0 @@
----
-osd_objectstore: "bluestore"
-osd_scenario: lvm
-devices:
-  - /dev/sda
-  - /dev/sdb
-  - /dev/sdc
\ No newline at end of file
diff --git a/tests/functional/docker2podman/host_vars/osd0 b/tests/functional/docker2podman/host_vars/osd0
new file mode 100644
index 000000000..db8a552cd
--- /dev/null
+++ b/tests/functional/docker2podman/host_vars/osd0
@@ -0,0 +1,7 @@
+---
+osd_objectstore: "bluestore"
+osd_scenario: lvm
+devices:
+  - /dev/sda
+  - /dev/sdb
+  - /dev/sdc
\ No newline at end of file
diff --git a/tests/functional/docker2podman/host_vars/osd1 b/tests/functional/docker2podman/host_vars/osd1
new file mode 100644
index 000000000..f0b44970f
--- /dev/null
+++ b/tests/functional/docker2podman/host_vars/osd1
@@ -0,0 +1,7 @@
+---
+osd_objectstore: "bluestore"
+osd_scenario: collocated
+devices:
+  - /dev/sda
+  - /dev/sdb
+  - /dev/sdc
diff --git a/tests/functional/docker2podman/hosts b/tests/functional/docker2podman/hosts
index f849f0483..abfcacb13 100644
--- a/tests/functional/docker2podman/hosts
+++ b/tests/functional/docker2podman/hosts
@@ -3,6 +3,7 @@ mon0
 
 [osds]
 osd0
+osd1
 
 [mgrs]
 mon0
diff --git a/tests/functional/docker2podman/vagrant_variables.yml b/tests/functional/docker2podman/vagrant_variables.yml
index 9588b1968..33692c123 100644
--- a/tests/functional/docker2podman/vagrant_variables.yml
+++ b/tests/functional/docker2podman/vagrant_variables.yml
@@ -5,7 +5,7 @@ docker: True
 
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 1
-osd_vms: 1
+osd_vms: 2
 mds_vms: 0
 rgw_vms: 1
 nfs_vms: 1