tests: remove OSD_FORCE_ZAP variable from tests

according to ceph/ceph-container#840, this variable is no longer needed.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit aa0b1ed11872ea6f69f69b4a376b13ae5d6e12e0)

diff --git a/roles/ceph-osd/tasks/build_devices.yml b/roles/ceph-osd/tasks/build_devices.yml
new file mode 100644 (file)
index 0000000..b578c32
--- /dev/null
+++ b/roles/ceph-osd/tasks/build_devices.yml
@@ -0,0 +1,37 @@
+---
+- name: set_fact devices generate device list when osd_auto_discovery
+  set_fact:
+    devices: "{{ devices | default([]) + [ item.key | regex_replace('^', '/dev/') ] }}"
+  with_dict: "{{ ansible_devices }}"
+  when:
+    - osd_auto_discovery
+    - ansible_devices is defined
+    - item.value.removable == "0"
+    - item.value.sectors != "0"
+    - item.value.partitions|count == 0
+    - item.value.holders|count == 0
+    - "'dm-' not in item.key"
+
+- name: resolve dedicated device link(s)
+  command: readlink -f {{ item }}
+  changed_when: false
+  with_items: "{{ dedicated_devices }}"
+  register: dedicated_devices_prepare_canonicalize
+  when:
+    - osd_scenario == 'non-collocated'
+    - not osd_auto_discovery
+
+- name: set_fact build dedicated_devices from resolved symlinks
+  set_fact:
+    dedicated_devices_tmp: "{{ dedicated_devices_tmp | default([]) + [ item.stdout ] }}"
+  with_items: "{{ dedicated_devices_prepare_canonicalize.results }}"
+  when:
+    - osd_scenario == 'non-collocated'
+    - not osd_auto_discovery
+
+- name: set_fact build final dedicated_devices list
+  set_fact:
+    dedicated_devices: "{{ dedicated_devices_tmp | reject('search','/dev/disk') | list }}"
+  when:
+    - osd_scenario == 'non-collocated'
+    - not osd_auto_discovery

diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index 1293681dd4d9af21682df8eebdf5851caf5ff5e7..be801dd7be3fad60e6f6109e03b59384e874985a 100644 (file)
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -18,23 +18,8 @@
 - name: include ceph_disk_cli_options_facts.yml
   include: ceph_disk_cli_options_facts.yml
 
-- name: set_fact devices generate device list when osd_auto_discovery
-  set_fact:
-    devices: "{{ devices | default([]) + [ item.key | regex_replace('^', '/dev/') ] }}"
-  with_dict: "{{ ansible_devices }}"
-  when:
-    - osd_auto_discovery
-    - ansible_devices is defined
-    - item.value.removable == "0"
-    - item.value.sectors != "0"
-    - item.value.partitions|count == 0
-    - item.value.holders|count == 0
-    - "'dm-' not in item.key"
-
-- name: include check_devices.yml
-  include: check_devices.yml
-  when:
-    - not osd_auto_discovery
+- name: include build_devices.yml
+  include: build_devices.yml
 
 - name: check if a partition named 'ceph' exists
   shell: "parted --script {{ item }} print | egrep -sq '^ 1.*ceph'"

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 f80e364cf6a0147d449ec34b9c764924945faac3..caa91d0848f9023d09925bbe0116bcc1e7cc613f 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,7 @@ 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 }} -e OSD_FORCE_ZAP=1
+ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }}
 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 d703a67c3b8d7d6b92aa71895f068738268215c4..50870793d3591e0ca28337eaa318394bf10e99e1 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,7 @@ 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 }} -e OSD_FORCE_ZAP=1
+ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }}
 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 5fe27d9898b42080ac2d2381de5098c0352e1a03..ee108ac786d8d0c676408d7793013bce6396704c 100644 (file)
--- a/tests/functional/centos/7/docker/group_vars/all
+++ b/tests/functional/centos/7/docker/group_vars/all
@@ -15,7 +15,7 @@ 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 }} -e OSD_FORCE_ZAP=1
+ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }}
 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 ad222a98034235239a475948fc272d58c0dbe409..7afcac550647d73a5ee06b29aa0bbcbb65966256 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,7 @@ 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 }} -e OSD_FORCE_ZAP=1
+ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }}
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1