From: Sébastien Han Date: Wed, 20 Dec 2017 12:39:33 +0000 (+0100) Subject: fix jewel scenarios on container X-Git-Tag: beta-3.1.0~11 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=39f2bfd5d58bae3fef2dd4fca0b2bab2e67ba21f;p=ceph-ansible.git 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 --- 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