From f5f8d264e253ffde748da4ad1281ff47617f6d05 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 10 Apr 2019 17:16:21 +0200
Subject: [PATCH] osds: allow passing devices by path

ceph-volume didn't work when the devices where passed by path.
Since it now support it, let's allow this feature in ceph-ansible

Closes: #3812

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 7e0adca7a45fe841e40eed774a15a6cc97e638e4)
---
 roles/ceph-facts/tasks/facts.yml                    | 3 ---
 tests/functional/lvm-batch/container/group_vars/all | 2 +-
 tests/functional/lvm-batch/group_vars/all           | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/roles/ceph-facts/tasks/facts.yml b/roles/ceph-facts/tasks/facts.yml
index b55c2d314..4caed5c1d 100644
--- a/roles/ceph-facts/tasks/facts.yml
+++ b/roles/ceph-facts/tasks/facts.yml
@@ -165,7 +165,6 @@
     - devices is defined
     - inventory_hostname in groups.get(osd_group_name, [])
     - not osd_auto_discovery|default(False)
-    - osd_scenario|default('dummy') != 'lvm'
 
 - name: set_fact build devices from resolved symlinks
   set_fact:
@@ -175,7 +174,6 @@
     - devices is defined
     - inventory_hostname in groups.get(osd_group_name, [])
     - not osd_auto_discovery|default(False)
-    - osd_scenario|default('dummy') != 'lvm'
 
 - name: set_fact build final devices list
   set_fact:
@@ -184,7 +182,6 @@
     - devices is defined
     - inventory_hostname in groups.get(osd_group_name, [])
     - not osd_auto_discovery|default(False)
-    - osd_scenario|default('dummy') != 'lvm'
 
 - name: set_fact devices generate device list when osd_auto_discovery
   set_fact:
diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all
index ddf9306d3..81b853c45 100644
--- a/tests/functional/lvm-batch/container/group_vars/all
+++ b/tests/functional/lvm-batch/container/group_vars/all
@@ -19,7 +19,7 @@ osd_scenario: lvm
 copy_admin_key: true
 devices:
   - /dev/sdb
-  - /dev/sdc
+  - /dev/disk/by-id/ata-QEMU_HARDDISK_QM00003
 os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
diff --git a/tests/functional/lvm-batch/group_vars/all b/tests/functional/lvm-batch/group_vars/all
index b3126b13c..cde0eaa22 100644
--- a/tests/functional/lvm-batch/group_vars/all
+++ b/tests/functional/lvm-batch/group_vars/all
@@ -12,7 +12,7 @@ crush_device_class: test
 osd_scenario: lvm
 copy_admin_key: true
 devices:
-  - /dev/sdb 
+  - /dev/disk/by-id/ata-QEMU_HARDDISK_QM00002
   - /dev/sdc
 os_tuning_params:
   - { name: fs.file-max, value: 26234859 }