fix jewel scenarios on container

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 <seb@redhat.com>

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 caa91d0848f9023d09925bbe0116bcc1e7cc613f..8da3e4d00616530a5fa5a6ca0c67253149c0cacc 100644 (file)
--- 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 50870793d3591e0ca28337eaa318394bf10e99e1..42df7b7fbb6e6607b653d5f65d37d0da45c0e7e7 100644 (file)
--- 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 ee108ac786d8d0c676408d7793013bce6396704c..9575fa4352cbced1f30009792ea12fae6bb3eb4f 100644 (file)
--- 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 7afcac550647d73a5ee06b29aa0bbcbb65966256..afb650543a6bf6e40cb3763f21f991acd22ed123 100644 (file)
--- 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