ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 8f2c45dfd3)
pull/3958/head
Guillaume Abrioux 2019-04-10 17:16:21 +02:00
parent addcc1e61a
commit 5053f32c15
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/ceph-facts/tasks/facts.yml
View File

@ -164,7 +164,6 @@
- devices is defined - devices is defined
- inventory_hostname in groups.get(osd_group_name, []) - inventory_hostname in groups.get(osd_group_name, [])
- not osd_auto_discovery|default(False) - not osd_auto_discovery|default(False)
- osd_scenario|default('dummy') != 'lvm'
- name: set_fact build devices from resolved symlinks - name: set_fact build devices from resolved symlinks
set_fact: set_fact:
@ -174,7 +173,6 @@
- devices is defined - devices is defined
- inventory_hostname in groups.get(osd_group_name, []) - inventory_hostname in groups.get(osd_group_name, [])
- not osd_auto_discovery|default(False) - not osd_auto_discovery|default(False)
- osd_scenario|default('dummy') != 'lvm'
- name: set_fact build final devices list - name: set_fact build final devices list
set_fact: set_fact:
@ -183,7 +181,6 @@
- devices is defined - devices is defined
- inventory_hostname in groups.get(osd_group_name, []) - inventory_hostname in groups.get(osd_group_name, [])
- not osd_auto_discovery|default(False) - not osd_auto_discovery|default(False)
- osd_scenario|default('dummy') != 'lvm'
- name: set_fact ceph_uid for debian based system - non container - name: set_fact ceph_uid for debian based system - non container
set_fact: set_fact:

2
tests/functional/lvm-batch/container/group_vars/all
View File

@ -19,7 +19,7 @@ osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
devices: devices:
- /dev/sdb - /dev/sdb
- /dev/sdc - /dev/disk/by-id/ata-QEMU_HARDDISK_QM00003
os_tuning_params: os_tuning_params:
- { name: fs.file-max, value: 26234859 } - { name: fs.file-max, value: 26234859 }
ceph_conf_overrides: ceph_conf_overrides:

2
tests/functional/lvm-batch/group_vars/all
View File

@ -12,7 +12,7 @@ crush_device_class: test
osd_scenario: lvm osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
devices: devices:
- /dev/sdb - /dev/disk/by-id/ata-QEMU_HARDDISK_QM00002
- /dev/sdc - /dev/sdc
os_tuning_params: os_tuning_params:
- { name: fs.file-max, value: 26234859 } - { name: fs.file-max, value: 26234859 }