From 1028de639e11cb94e7a7b9ad315a414a2d4fc315 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 20 Dec 2017 13:39:33 +0100 Subject: [PATCH] fix jewel scenarios on container MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When deploying Jewel from master we still need to enable this code since the container image has such check. This check still exists because ceph-disk is not able to create a GPT label on a drive that does not have one. Signed-off-by: Sébastien Han (cherry picked from commit 39f2bfd5d58bae3fef2dd4fca0b2bab2e67ba21f) Signed-off-by: Sébastien Han --- tests/functional/centos/7/bs-osds-container/group_vars/all.yml | 3 ++- tests/functional/centos/7/docker-collocation/group_vars/all | 3 ++- tests/functional/centos/7/docker/group_vars/all | 3 ++- tests/functional/centos/7/fs-osds-container/group_vars/all.yml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/functional/centos/7/bs-osds-container/group_vars/all.yml b/tests/functional/centos/7/bs-osds-container/group_vars/all.yml index caa91d084..8da3e4d00 100644 --- a/tests/functional/centos/7/bs-osds-container/group_vars/all.yml +++ b/tests/functional/centos/7/bs-osds-container/group_vars/all.yml @@ -6,7 +6,8 @@ cluster: test monitor_interface: eth1 public_network: "192.168.35.0/24" cluster_network: "192.168.36.0/24" -ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} +# OSD_FORCE_ZAP is only for Jewel, the function does not exist anymore on Luminous and above +ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 ceph_conf_overrides: global: osd_pool_default_size: 1 diff --git a/tests/functional/centos/7/docker-collocation/group_vars/all b/tests/functional/centos/7/docker-collocation/group_vars/all index 50870793d..42df7b7fb 100644 --- a/tests/functional/centos/7/docker-collocation/group_vars/all +++ b/tests/functional/centos/7/docker-collocation/group_vars/all @@ -15,7 +15,8 @@ cluster_network: "192.168.16.0/24" osd_scenario: collocated ceph_rgw_civetweb_port: 8080 osd_objectstore: filestore -ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} +# OSD_FORCE_ZAP is only for Jewel, the function does not exist anymore on Luminous and above +ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 devices: - /dev/sda - /dev/sdb diff --git a/tests/functional/centos/7/docker/group_vars/all b/tests/functional/centos/7/docker/group_vars/all index ee108ac78..9575fa435 100644 --- a/tests/functional/centos/7/docker/group_vars/all +++ b/tests/functional/centos/7/docker/group_vars/all @@ -15,7 +15,8 @@ cluster_network: "192.168.18.0/24" osd_scenario: collocated ceph_rgw_civetweb_port: 8080 osd_objectstore: filestore -ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} +# OSD_FORCE_ZAP is only for Jewel, the function does not exist anymore on Luminous and above +ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 devices: - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - /dev/sdb diff --git a/tests/functional/centos/7/fs-osds-container/group_vars/all.yml b/tests/functional/centos/7/fs-osds-container/group_vars/all.yml index 7afcac550..afb650543 100644 --- a/tests/functional/centos/7/fs-osds-container/group_vars/all.yml +++ b/tests/functional/centos/7/fs-osds-container/group_vars/all.yml @@ -6,7 +6,8 @@ cluster: test monitor_interface: eth1 public_network: "192.168.55.0/24" cluster_network: "192.168.56.0/24" -ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} +# OSD_FORCE_ZAP is only for Jewel, the function does not exist anymore on Luminous and above +ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 ceph_conf_overrides: global: osd_pool_default_size: 1 -- 2.39.5