From d77960d9aa59eab8e84fb61b29af205d10060a47 Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Thu, 13 Feb 2020 17:04:38 +0100 Subject: [PATCH] ceph-volume: fix nautilus functional tests This is commited straight to nautilus, as post nautilus functional tests are run on CentOS8. Signed-off-by: Jan Fajerski --- .../batch/playbooks/setup_mixed_type.yml | 16 ++++++++++++++++ .../tests/functional/batch/playbooks/test.yml | 9 +++++++++ .../functional/batch/playbooks/test_explicit.yml | 3 +++ .../functional/batch/playbooks/test_zap.yml | 3 +++ 4 files changed, 31 insertions(+) diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/setup_mixed_type.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/setup_mixed_type.yml index 179267aab3e3..5ed9fdefa67d 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/setup_mixed_type.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/setup_mixed_type.yml @@ -3,6 +3,22 @@ become: yes tasks: + - name: install lvm2 + package: + name: lvm2 + state: present + - name: tell lvm to globally ignore loop devices + lineinfile: + path: /etc/lvm/lvm.conf + line: ' global_filter = [ "r|loop|", "a|.*|" ]' + insertafter: '^devices {' + - name: tell lvm to ignore loop devices + lineinfile: + path: /etc/lvm/lvm.conf + line: ' filter = [ "r|loop|", "a|.*|" ]' + insertafter: '^devices {' + - name: rescan pvs + command: "pvscan --cache" - name: create the nvme image systemd unit copy: content: | diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml index 1b0fe1f8cebf..7c6c30597ddf 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml @@ -14,6 +14,9 @@ become: yes tasks: + - name: mark osds down + command: "ceph --cluster {{ cluster }} osd down osd.{{ item }}" + with_items: "{{ osd_ids }}" - name: purge osds command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it" with_items: "{{ osd_ids }}" @@ -23,6 +26,12 @@ become: yes tasks: + - name: rescan pvs + command: "pvscan --cache" + - name: rescan vgs + command: "vgscan" + - name: list lvs + command: "lvs" - name: zap devices used for OSDs command: "ceph-volume --cluster {{ cluster }} lvm zap {{ item }} --destroy" with_items: "{{ devices }}" diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml index 4c5cbfc9a3b3..ac01062a0503 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml @@ -14,6 +14,9 @@ become: yes tasks: + - name: mark osds down + command: "ceph --cluster {{ cluster }} osd down osd.{{ item }}" + with_items: "{{ osd_ids }}" - name: purge osds command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it" with_items: "{{ osd_ids }}" diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_zap.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_zap.yml index 850ecc94e37e..9d63df9e0fc9 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_zap.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_zap.yml @@ -14,6 +14,9 @@ become: yes tasks: + - name: mark osds down + command: "ceph --cluster {{ cluster }} osd down osd.{{ item }}" + with_items: "{{ osd_ids }}" - name: purge osds command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it" with_items: "{{ osd_ids }}" -- 2.47.3