X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fansible%2Froles%2Fcleaner%2Ftasks%2Fmain.yml;h=0f65d7eb20ed2995b4d86a2ecd2b1171399f1338;hb=d5a74591c6716aad140b91153ec72bc61426480c;hp=93aeb59debce40a51892a6c1beeb9b6cfaa46602;hpb=64df7bc3bc70d49153409436b411fb327691a4d5;p=stor4nfv.git

diff --git a/ci/ansible/roles/cleaner/tasks/main.yml b/ci/ansible/roles/cleaner/tasks/main.yml
index 93aeb59..0f65d7e 100644
--- a/ci/ansible/roles/cleaner/tasks/main.yml
+++ b/ci/ansible/roles/cleaner/tasks/main.yml
@@ -1,8 +1,36 @@
 ---
+- name: kill osdslet daemon service
+  shell: killall osdslet
+  ignore_errors: yes
+  when: container_enabled == false
+
+- name: kill osdslet containerized service
+  docker:
+    image: opensdsio/opensds-controller:latest
+    state: stopped
+  when: container_enabled == true
+
+- name: kill osdsdock daemon service
+  shell: killall osdsdock
+  ignore_errors: yes
+  when: container_enabled == false
+
+- name: kill osdsdock containerized service
+  docker:
+    image: opensdsio/opensds-dock:latest
+    state: stopped
+  when: container_enabled == true
+
 - name: kill etcd daemon service
   shell: killall etcd
   ignore_errors: yes
-  when: db_driver == "etcd"
+  when: db_driver == "etcd" and container_enabled == false
+
+- name: kill etcd containerized service
+  docker:
+    image: {{ etcd_docker_image }}
+    state: stopped
+  when: db_driver == "etcd" and container_enabled == true
 
 - name: remove etcd service data
   file:
@@ -14,23 +42,44 @@
 
 - name: remove etcd tarball
   file:
-    path: "/tmp/{{ etcd_tarball }}"
+    path: "/opt/{{ etcd_tarball }}"
     state: absent
     force: yes
   ignore_errors: yes
   when: db_driver == "etcd"
 
-- name: kill osdslet daemon service
-  shell: killall osdslet
+- name: clean opensds release files
+  file:
+    path: "{{ opensds_dir }}"
+    state: absent
+    force: yes
   ignore_errors: yes
 
-- name: kill osdsdock daemon service
-  shell: killall osdsdock
+- name: clean opensds release tarball file
+  file:
+    path: "{{ opensds_tarball_url }}"
+    state: absent
+    force: yes
+  ignore_errors: yes
+
+- name: clean opensds flexvolume plugins binary file
+  file:
+    path: "{{ flexvolume_plugin_dir }}"
+    state: absent
+    force: yes
   ignore_errors: yes
+  when: nbp_plugin_type == "flexvolume"
 
-- name: clean all opensds build files
+- name: clean nbp release files
   file:
-    path: "{{ opensds_build_dir }}"
+    path: "{{ nbp_dir }}"
+    state: absent
+    force: yes
+  ignore_errors: yes
+
+- name: clean nbp release tarball file
+  file:
+    path: "{{ nbp_tarball_url }}"
     state: absent
     force: yes
   ignore_errors: yes
@@ -56,19 +105,16 @@
   when: enabled_backend == "lvm"
 
 - name: remove a volume group if lvm backend specified
-  shell: vgremove {{ vg_name }}
+  lvg:
+    vg: "{{ vg_name }}"
+    state: absent
   when: enabled_backend == "lvm" and vg_existed.rc == 0
 
-- name: check if it existed before cleaning a physical volume
-  shell: pvdisplay {{ pv_device }}
-  ignore_errors: yes
-  register: pv_existed
+- name: remove physical volumes if lvm backend specified
+  shell: pvremove {{ item }}
+  with_items: "{{ pv_devices }}"
   when: enabled_backend == "lvm"
 
-- name: remove a physical volume if lvm backend specified
-  shell: pvremove {{ pv_device }}
-  when: enabled_backend == "lvm" and pv_existed.rc == 0
-
 - name: stop cinder-standalone service
   shell: docker-compose down
   become: true