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>

diff --git a/tests/functional/centos/7/bluestore/group_vars/all b/tests/functional/centos/7/bluestore/group_vars/all
index 518170988b145ca509690318c2a9654402a1add7..cf761a1783eaccb4ff7a590712338f2764da08ca 100644 (file)
--- 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 4d9eb02b4fdcf5a1aef37746350de0cc568397d0..1a4e31c3ee307247ab013f8fad5b33f39a524c67 100644 (file)
--- 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 3ecc8bd435d3d2737cc47f781010310ef15e768a..2a47dd394560e097797f10d2736639129c635b44 100644 (file)
--- 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 2380f8c5ac0fc5340e047e82244db2334a4cec36..96be81a58f88982005b8d1b384cbdf6abdd5e37f 100644 (file)
--- 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 902bb4f93683a6c94162a64a8fbb88c7c1410898..0b31b8e8b7384433860d04433fc9844a176c29e9 100644 (file)
--- 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 29c887a8bc1dc46070e2dbd4d38c35a023ef788c..2fb10a77b60099b91f3103fe0e2a96079275e0bd 100644 (file)
--- 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 eb589f77dfdd39a386182bf90b3aef81d4e0325b..8cb59549561912350fae0a9768d708e0e75f6d7f 100644 (file)
--- 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 6fe0e959cba5b6657de1483fdfa57853c0ac6917..302d09f7db715b2b05dfc9f30c9215b4f6f2a797 100644 (file)
--- 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 36cd697b7a4d86062fa545b5b2d2d43cd6ce3a67..d2c3ec381b9e748b1462f63e46e9022cc5bca585 100644 (file)
--- 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 983f1c265b11131572f9f19683bc67ae0d50b7b2..b0093cbea6209c9f3aa66f97b08271e0ac05467f 100644 (file)
--- 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 b719d082b121ad5be05230d18c23dc157b006f68..722c9e528c0e64e3f89b43eee8fc59059862a629 100644 (file)
--- 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 7603b20af8a570479c52e7214f63024b4a850fcd..5fe27d9898b42080ac2d2381de5098c0352e1a03 100644 (file)
--- 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 17340d4ed49d61b34b9af2f6ac7a2d03495a9fee..392e9c194619f99ba939b9fb98ff172818ac7c39 100644 (file)
--- 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 9548e2293caf9affb0d7cc82579504b2457f285b..d3574a1913f4d46468f29b3239ffd49a78d8b0b1 100644 (file)
--- 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'