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

ci: use by-id instead of by-path 

by-id relies on the disk WWID which is more reliable then by-path
(pointing to the PCI info)

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/2009/head
Sébastien Han 2017-10-07 00:58:54 +02:00
parent 05f26031ea
commit abb8c374cf
14 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/functional/centos/7/bluestore/group_vars/all
View File

@ -10,7 +10,7 @@ cluster_network: "192.168.36.0/24"
journal_size: 100 journal_size: 100
osd_objectstore: "bluestore" osd_objectstore: "bluestore"
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- '/dev/sdb' - '/dev/sdb'
dedicated_devices: dedicated_devices:
- '/dev/sdc' - '/dev/sdc'

2
tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all
View File

@ -11,7 +11,7 @@ osd_scenario: non-collocated
dmcrypt: true dmcrypt: true
osd_objectstore: "bluestore" osd_objectstore: "bluestore"
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- '/dev/sdb' - '/dev/sdb'
dedicated_devices: dedicated_devices:
- '/dev/sdc' - '/dev/sdc'

2
tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all
View File

@ -11,7 +11,7 @@ osd_scenario: collocated
dmcrypt: true dmcrypt: true
osd_objectstore: bluestore osd_objectstore: bluestore
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- '/dev/sdb' - '/dev/sdb'
os_tuning_params: os_tuning_params:
- { name: kernel.pid_max, value: 4194303 } - { name: kernel.pid_max, value: 4194303 }

2
tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all
View File

@ -11,7 +11,7 @@ osd_scenario: collocated
dmcrypt: true dmcrypt: true
osd_objectstore: bluestore osd_objectstore: bluestore
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- '/dev/sdb' - '/dev/sdb'
os_tuning_params: os_tuning_params:
- { name: kernel.pid_max, value: 4194303 } - { name: kernel.pid_max, value: 4194303 }

2
tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all
View File

@ -16,7 +16,7 @@ ceph_rgw_civetweb_port: 8080
osd_scenario: non-collocated osd_scenario: non-collocated
osd_objectstore: bluestore osd_objectstore: bluestore
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- /dev/sdb - /dev/sdb
dedicated_devices: dedicated_devices:
- /dev/sdc - /dev/sdc

2
tests/functional/centos/7/bs-jrn-col/group_vars/all
View File

@ -9,7 +9,7 @@ public_network: "192.168.3.0/24"
cluster_network: "192.168.4.0/24" cluster_network: "192.168.4.0/24"
journal_size: 100 journal_size: 100
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- '/dev/sdb' - '/dev/sdb'
osd_scenario: collocated osd_scenario: collocated
osd_objectstore: "bluestore" osd_objectstore: "bluestore"

2
tests/functional/centos/7/cluster/group_vars/all
View File

@ -9,7 +9,7 @@ journal_size: 100
radosgw_interface: eth1 radosgw_interface: eth1
osd_objectstore: filestore osd_objectstore: filestore
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- '/dev/sdb' - '/dev/sdb'
dedicated_devices: dedicated_devices:
- '/dev/sdc' - '/dev/sdc'

2
tests/functional/centos/7/crypt-ded-jrn/group_vars/all
View File

@ -11,7 +11,7 @@ osd_scenario: non-collocated
dmcrypt: true dmcrypt: true
osd_objectstore: filestore osd_objectstore: filestore
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- '/dev/sdb' - '/dev/sdb'
dedicated_devices: dedicated_devices:
- '/dev/sdc' - '/dev/sdc'

2
tests/functional/centos/7/crypt-jrn-col/group_vars/all
View File

@ -11,7 +11,7 @@ osd_scenario: collocated
osd_objectstore: filestore osd_objectstore: filestore
dmcrypt: true dmcrypt: true
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- '/dev/sdb' - '/dev/sdb'
os_tuning_params: os_tuning_params:
- { name: kernel.pid_max, value: 4194303 } - { name: kernel.pid_max, value: 4194303 }

2
tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all
View File

@ -17,6 +17,6 @@ osd_objectstore: filestore
dmcrypt: true dmcrypt: true
ceph_rgw_civetweb_port: 8080 ceph_rgw_civetweb_port: 8080
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- /dev/sdb - /dev/sdb
ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1

2
tests/functional/centos/7/docker-ded-jrn/group_vars/all
View File

@ -16,7 +16,7 @@ ceph_rgw_civetweb_port: 8080
osd_objectstore: filestore osd_objectstore: filestore
osd_scenario: non-collocated osd_scenario: non-collocated
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- /dev/sdb - /dev/sdb
dedicated_devices: dedicated_devices:
- /dev/sdc - /dev/sdc

2
tests/functional/centos/7/docker/group_vars/all
View File

@ -17,7 +17,7 @@ ceph_rgw_civetweb_port: 8080
osd_objectstore: filestore osd_objectstore: filestore
ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- /dev/sdb - /dev/sdb
ceph_osd_docker_run_script_path: /var/tmp ceph_osd_docker_run_script_path: /var/tmp
rgw_override_bucket_index_max_shards: 16 rgw_override_bucket_index_max_shards: 16

2
tests/functional/centos/7/jrn-col/group_vars/all
View File

@ -10,7 +10,7 @@ radosgw_interface: eth1
journal_size: 100 journal_size: 100
osd_objectstore: filestore osd_objectstore: filestore
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- '/dev/sdb' - '/dev/sdb'
osd_scenario: collocated osd_scenario: collocated
os_tuning_params: os_tuning_params:

2
tests/functional/ubuntu/16.04/cluster/group_vars/all
View File

@ -9,7 +9,7 @@ monitor_interface: eth1
radosgw_interface: eth1 radosgw_interface: eth1
journal_size: 100 journal_size: 100
devices: devices:
- '/dev/disk/by-path/pci-0000:00:01.1-ata-1' - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001'
- '/dev/sdb' - '/dev/sdb'
dedicated_devices: dedicated_devices:
- '/dev/sdc' - '/dev/sdc'