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 <jfajerski@suse.com>

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 179267aab3e31f65c4af6e15e0072e2614c51a39..5ed9fdefa67dce2161a7bf24b04f3ca0d972c491 100644 (file)
--- 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 1b0fe1f8cebfdbe0bea3f77742cb9cddcb1ce511..7c6c30597ddf2a703673b0625551935a6169df9a 100644 (file)
--- 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 4c5cbfc9a3b3dbbb57ed06e069359508408f42cf..ac01062a0503909ca182d567cab5a780f502a0eb 100644 (file)
--- 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 850ecc94e37e2f46650ffb9fd9ef82681122e705..9d63df9e0fc9703813a53c27a66e95caa7afe11a 100644 (file)
--- 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 }}"