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 8f2c45dfd3d1d3875a480247ca047aa52d7cd1b1)

diff --git a/roles/ceph-facts/tasks/facts.yml b/roles/ceph-facts/tasks/facts.yml
index 762b955ca561b5bd59a151045a5fca20606cafa8..c0c2215baba6adf787cd280822feb272a368f57a 100644 (file)
--- a/roles/ceph-facts/tasks/facts.yml
+++ b/roles/ceph-facts/tasks/facts.yml
@@ -164,7 +164,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:
@@ -174,7 +173,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:
@@ -183,7 +181,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 ceph_uid for debian based system - non container
   set_fact:

diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all
index 6ed0becf0c5f70f4984ea97a20cc505daa64f8be..9360bafbe017c81532635ce0511f8d1d9a294b2c 100644 (file)
--- 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 2e5daca3af5d84ee99de2737a6d44147b555d8a6..614d8f5f128e2618237f9be214213c87aed0cde2 100644 (file)
--- 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 }