Update the latest version of ansible script

[stor4nfv.git] / ci / ansible / roles / cleaner / tasks / main.yml

diff --git a/ci/ansible/roles/cleaner/tasks/main.yml b/ci/ansible/roles/cleaner/tasks/main.yml
index 8399b08..ed887c6 100644 (file)
--- a/ci/ansible/roles/cleaner/tasks/main.yml
+++ b/ci/ansible/roles/cleaner/tasks/main.yml
@@ -14,7 +14,7 @@
 \r
 - name: kill osdslet daemon service\r
   shell: killall osdslet osdsdock\r
-  when: container_enabled == false\r
+  when: install_from != "container"\r
   ignore_errors: true\r
 \r
 - name: kill osdslet containerized service\r
@@ -22,14 +22,14 @@
     name: osdslet\r
     image: "{{ controller_docker_image }}"\r
     state: stopped\r
-  when: container_enabled == true\r
+  when: install_from == "container"\r
 \r
 - name: kill osdsdock containerized service\r
   docker_container:\r
     name: osdsdock\r
     image: "{{ dock_docker_image }}"\r
     state: stopped\r
-  when: container_enabled == true\r
+  when: install_from == "container"\r
 \r
 - name: stop container where dashboard is located\r
   docker_container:\r
@@ -46,6 +46,15 @@
   ignore_errors: yes\r
   when: nbp_plugin_type == "flexvolume"\r
 \r
+- name: clean opensds external provisioner plugin if flexvolume specified\r
+  shell: |\r
+    . /etc/profile\r
+    kubectl delete -f deploy/\r
+  args:\r
+    chdir: "{{ nbp_work_dir }}/provisioner"\r
+  ignore_errors: yes\r
+  when: nbp_plugin_type == "flexvolume"\r
+\r
 - name: clean opensds csi plugin if csi plugin specified\r
   shell: |\r
     . /etc/profile\r