From abb8c374cfd13f06ae07413780e81bb79ad65cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Sat, 7 Oct 2017 00:58:54 +0200 Subject: [PATCH] ci: use by-id instead of by-path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- tests/functional/centos/7/bluestore/group_vars/all | 2 +- tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all | 2 +- tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all | 2 +- tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all | 2 +- tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all | 2 +- tests/functional/centos/7/bs-jrn-col/group_vars/all | 2 +- tests/functional/centos/7/cluster/group_vars/all | 2 +- tests/functional/centos/7/crypt-ded-jrn/group_vars/all | 2 +- tests/functional/centos/7/crypt-jrn-col/group_vars/all | 2 +- tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all | 2 +- tests/functional/centos/7/docker-ded-jrn/group_vars/all | 2 +- tests/functional/centos/7/docker/group_vars/all | 2 +- tests/functional/centos/7/jrn-col/group_vars/all | 2 +- tests/functional/ubuntu/16.04/cluster/group_vars/all | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/functional/centos/7/bluestore/group_vars/all b/tests/functional/centos/7/bluestore/group_vars/all index 518170988..cf761a178 100644 --- a/tests/functional/centos/7/bluestore/group_vars/all +++ b/tests/functional/centos/7/bluestore/group_vars/all @@ -10,7 +10,7 @@ cluster_network: "192.168.36.0/24" journal_size: 100 osd_objectstore: "bluestore" devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - '/dev/sdb' dedicated_devices: - '/dev/sdc' diff --git a/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all b/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all index 4d9eb02b4..1a4e31c3e 100644 --- a/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all +++ b/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all @@ -11,7 +11,7 @@ osd_scenario: non-collocated dmcrypt: true osd_objectstore: "bluestore" devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - '/dev/sdb' dedicated_devices: - '/dev/sdc' diff --git a/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all b/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all index 3ecc8bd43..2a47dd394 100644 --- a/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all +++ b/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all @@ -11,7 +11,7 @@ osd_scenario: collocated dmcrypt: true osd_objectstore: bluestore devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - '/dev/sdb' os_tuning_params: - { name: kernel.pid_max, value: 4194303 } diff --git a/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all b/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all index 2380f8c5a..96be81a58 100644 --- a/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all +++ b/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all @@ -11,7 +11,7 @@ osd_scenario: collocated dmcrypt: true osd_objectstore: bluestore devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - '/dev/sdb' os_tuning_params: - { name: kernel.pid_max, value: 4194303 } diff --git a/tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all b/tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all index 902bb4f93..0b31b8e8b 100644 --- a/tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all +++ b/tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all @@ -16,7 +16,7 @@ ceph_rgw_civetweb_port: 8080 osd_scenario: non-collocated osd_objectstore: bluestore devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - /dev/sdb dedicated_devices: - /dev/sdc diff --git a/tests/functional/centos/7/bs-jrn-col/group_vars/all b/tests/functional/centos/7/bs-jrn-col/group_vars/all index 29c887a8b..2fb10a77b 100644 --- a/tests/functional/centos/7/bs-jrn-col/group_vars/all +++ b/tests/functional/centos/7/bs-jrn-col/group_vars/all @@ -9,7 +9,7 @@ public_network: "192.168.3.0/24" cluster_network: "192.168.4.0/24" journal_size: 100 devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - '/dev/sdb' osd_scenario: collocated osd_objectstore: "bluestore" diff --git a/tests/functional/centos/7/cluster/group_vars/all b/tests/functional/centos/7/cluster/group_vars/all index eb589f77d..8cb595495 100644 --- a/tests/functional/centos/7/cluster/group_vars/all +++ b/tests/functional/centos/7/cluster/group_vars/all @@ -9,7 +9,7 @@ journal_size: 100 radosgw_interface: eth1 osd_objectstore: filestore devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - '/dev/sdb' dedicated_devices: - '/dev/sdc' diff --git a/tests/functional/centos/7/crypt-ded-jrn/group_vars/all b/tests/functional/centos/7/crypt-ded-jrn/group_vars/all index 6fe0e959c..302d09f7d 100644 --- a/tests/functional/centos/7/crypt-ded-jrn/group_vars/all +++ b/tests/functional/centos/7/crypt-ded-jrn/group_vars/all @@ -11,7 +11,7 @@ osd_scenario: non-collocated dmcrypt: true osd_objectstore: filestore devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - '/dev/sdb' dedicated_devices: - '/dev/sdc' diff --git a/tests/functional/centos/7/crypt-jrn-col/group_vars/all b/tests/functional/centos/7/crypt-jrn-col/group_vars/all index 36cd697b7..d2c3ec381 100644 --- a/tests/functional/centos/7/crypt-jrn-col/group_vars/all +++ b/tests/functional/centos/7/crypt-jrn-col/group_vars/all @@ -11,7 +11,7 @@ osd_scenario: collocated osd_objectstore: filestore dmcrypt: true devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - '/dev/sdb' os_tuning_params: - { name: kernel.pid_max, value: 4194303 } diff --git a/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all b/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all index 983f1c265..b0093cbea 100644 --- a/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all +++ b/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all @@ -17,6 +17,6 @@ osd_objectstore: filestore dmcrypt: true ceph_rgw_civetweb_port: 8080 devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - /dev/sdb ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 diff --git a/tests/functional/centos/7/docker-ded-jrn/group_vars/all b/tests/functional/centos/7/docker-ded-jrn/group_vars/all index b719d082b..722c9e528 100644 --- a/tests/functional/centos/7/docker-ded-jrn/group_vars/all +++ b/tests/functional/centos/7/docker-ded-jrn/group_vars/all @@ -16,7 +16,7 @@ ceph_rgw_civetweb_port: 8080 osd_objectstore: filestore osd_scenario: non-collocated devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - /dev/sdb dedicated_devices: - /dev/sdc diff --git a/tests/functional/centos/7/docker/group_vars/all b/tests/functional/centos/7/docker/group_vars/all index 7603b20af..5fe27d989 100644 --- a/tests/functional/centos/7/docker/group_vars/all +++ b/tests/functional/centos/7/docker/group_vars/all @@ -17,7 +17,7 @@ ceph_rgw_civetweb_port: 8080 osd_objectstore: filestore ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - /dev/sdb ceph_osd_docker_run_script_path: /var/tmp rgw_override_bucket_index_max_shards: 16 diff --git a/tests/functional/centos/7/jrn-col/group_vars/all b/tests/functional/centos/7/jrn-col/group_vars/all index 17340d4ed..392e9c194 100644 --- a/tests/functional/centos/7/jrn-col/group_vars/all +++ b/tests/functional/centos/7/jrn-col/group_vars/all @@ -10,7 +10,7 @@ radosgw_interface: eth1 journal_size: 100 osd_objectstore: filestore devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - '/dev/sdb' osd_scenario: collocated os_tuning_params: diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/all b/tests/functional/ubuntu/16.04/cluster/group_vars/all index 9548e2293..d3574a191 100644 --- a/tests/functional/ubuntu/16.04/cluster/group_vars/all +++ b/tests/functional/ubuntu/16.04/cluster/group_vars/all @@ -9,7 +9,7 @@ monitor_interface: eth1 radosgw_interface: eth1 journal_size: 100 devices: - - '/dev/disk/by-path/pci-0000:00:01.1-ata-1' + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - '/dev/sdb' dedicated_devices: - '/dev/sdc'