From: Jan Fajerski <jfajerski@suse.com>
Date: Mon, 10 Feb 2020 09:09:14 +0000 (+0100)
Subject: lvm_setup: lookup device from inventory, default to /dev/sd* names
X-Git-Tag: v5.0.1~38
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5505b713f275f818f28ba4a2723056313c4e95cc;p=ceph-ansible.git

lvm_setup: lookup device from inventory, default to /dev/sd* names

This fixes a long standing fail in ceph-volumes lvm test suite.
Otherwise the default behaviour should not change.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 1fe8e819f90a6447ea25741c90b15578ac315ecd)
---

diff --git a/tests/functional/lvm_setup.yml b/tests/functional/lvm_setup.yml
index 1c5191937..35aeb6889 100644
--- a/tests/functional/lvm_setup.yml
+++ b/tests/functional/lvm_setup.yml
@@ -29,7 +29,7 @@
     - name: create volume group
       lvg:
         vg: test_group
-        pvs: /dev/sdb
+        pvs: "{{ pv_devices[0] | default('/dev/sdb') }}"
     - name: create logical volume 1
       lvol:
         vg: test_group
@@ -40,9 +40,9 @@
         vg: test_group
         lv: data-lv2
         size: 100%FREE
-    - name: partition /dev/sdc for journals
+    - name: partition  "{{ pv_devices[1] | default('/dev/sdc') }}"for journals
       parted:
-        device: /dev/sdc
+        device: "{{ pv_devices[1] | default('/dev/sdc') }}"
         number: 1
         part_start: 0%
         part_end: 50%
@@ -50,9 +50,9 @@
         label: gpt
         state: present
       tags: partitions
-    - name: partition /dev/sdc for journals
+    - name: partition  "{{ pv_devices[1] | default('/dev/sdc') }}"for journals
       parted:
-        device: /dev/sdc
+        device: "{{ pv_devices[1] | default('/dev/sdc') }}"
         number: 2
         part_start: 50%
         part_end: 100%
@@ -60,10 +60,10 @@
         state: present
         label: gpt
       tags: partitions
-    - name: create journals vg from /dev/sdc2
+    - name: create journals vg from  "{{ pv_devices[1] | default('/dev/sdc') }}2"
       lvg:
         vg: journals
-        pvs: /dev/sdc2
+        pvs: "{{ pv_devices[1] | default('/dev/sdc') }}2"
     - name: create journal1 lv
       lvol:
         vg: journals