ceph-volume tests.functional.simple add zap by osd id to centos7

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 8955ec14566c48a08bb4826256b422aa29a2c16e)

Conflicts:
	src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/test.yml
        remove with_items key

diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/test.yml
index 24e2c0353c942e831f8ea6abebb4d348d889c627..65dba09a8fb5a4c307706e55da9034b6c56809fc 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/test.yml
@@ -29,3 +29,42 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
+
+
+# zap tests
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: stop ceph-osd daemons
+      service:
+        name: "ceph-osd@{{ item }}"
+        state: stopped
+      with_items:
+        - "0"
+        - "1"
+
+
+- hosts: mons
+  become: yes
+  tasks:
+
+    - name: purge osds
+      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
+      with_items:
+        - "0"
+        - "1"
+
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: zap devices used for OSDs
+      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
+      with_items:
+        - "0"
+        - "1"
+      environment:
+        CEPH_VOLUME_DEBUG: 1

diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/test.yml
index 24e2c0353c942e831f8ea6abebb4d348d889c627..f58d690cb04c6552a019b3d6085470f460d6992d 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/test.yml
@@ -29,3 +29,42 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
+
+# zap tests
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: stop ceph-osd daemons
+      service:
+        name: "ceph-osd@{{ item }}"
+        state: stopped
+      with_items:
+        - "0"
+        - "1"
+
+
+- hosts: mons
+  become: yes
+  tasks:
+
+    - name: purge osds
+      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
+      with_items:
+        - "0"
+        - "1"
+
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: zap devices used for OSDs
+      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
+      with_items:
+        - "0"
+        - "1"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+

diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/test.yml
index 24e2c0353c942e831f8ea6abebb4d348d889c627..f58d690cb04c6552a019b3d6085470f460d6992d 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/test.yml
@@ -29,3 +29,42 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
+
+# zap tests
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: stop ceph-osd daemons
+      service:
+        name: "ceph-osd@{{ item }}"
+        state: stopped
+      with_items:
+        - "0"
+        - "1"
+
+
+- hosts: mons
+  become: yes
+  tasks:
+
+    - name: purge osds
+      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
+      with_items:
+        - "0"
+        - "1"
+
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: zap devices used for OSDs
+      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
+      with_items:
+        - "0"
+        - "1"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+

diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/test.yml
index 0745f2571ff5f503c56af09cefd6c65e6a91d5f3..2947a9bff3033635bb18a28132870326efd91c25 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/test.yml
@@ -27,3 +27,42 @@
       command: "ceph-volume --cluster={{ cluster }} simple activate --all"
       environment:
         CEPH_VOLUME_DEBUG: 1
+
+# zap tests
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: stop ceph-osd daemons
+      service:
+        name: "ceph-osd@{{ item }}"
+        state: stopped
+      with_items:
+        - "0"
+        - "1"
+
+
+- hosts: mons
+  become: yes
+  tasks:
+
+    - name: purge osds
+      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
+      with_items:
+        - "0"
+        - "1"
+
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: zap devices used for OSDs
+      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
+      with_items:
+        - "0"
+        - "1"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+

diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/test.yml
index 24e2c0353c942e831f8ea6abebb4d348d889c627..f58d690cb04c6552a019b3d6085470f460d6992d 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/test.yml
@@ -29,3 +29,42 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
+
+# zap tests
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: stop ceph-osd daemons
+      service:
+        name: "ceph-osd@{{ item }}"
+        state: stopped
+      with_items:
+        - "0"
+        - "1"
+
+
+- hosts: mons
+  become: yes
+  tasks:
+
+    - name: purge osds
+      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
+      with_items:
+        - "0"
+        - "1"
+
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: zap devices used for OSDs
+      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
+      with_items:
+        - "0"
+        - "1"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+

diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/test.yml
index 24e2c0353c942e831f8ea6abebb4d348d889c627..f58d690cb04c6552a019b3d6085470f460d6992d 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/test.yml
@@ -29,3 +29,42 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
+
+# zap tests
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: stop ceph-osd daemons
+      service:
+        name: "ceph-osd@{{ item }}"
+        state: stopped
+      with_items:
+        - "0"
+        - "1"
+
+
+- hosts: mons
+  become: yes
+  tasks:
+
+    - name: purge osds
+      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
+      with_items:
+        - "0"
+        - "1"
+
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: zap devices used for OSDs
+      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
+      with_items:
+        - "0"
+        - "1"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+