support deploying etcd on aarch64 platform

[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 334d5bb..0f65d7e 100644 (file)
--- a/ci/ansible/roles/cleaner/tasks/main.yml
+++ b/ci/ansible/roles/cleaner/tasks/main.yml
@@ -1,15 +1,36 @@
 ---\r
-- name: remove golang tarball\r
-  file:\r
-    path: "/opt/{{ golang_tarball }}"\r
-    state: absent\r
-    force: yes\r
+- name: kill osdslet daemon service\r
+  shell: killall osdslet\r
   ignore_errors: yes\r
+  when: container_enabled == false\r
+\r
+- name: kill osdslet containerized service\r
+  docker:\r
+    image: opensdsio/opensds-controller:latest\r
+    state: stopped\r
+  when: container_enabled == true\r
+\r
+- name: kill osdsdock daemon service\r
+  shell: killall osdsdock\r
+  ignore_errors: yes\r
+  when: container_enabled == false\r
+\r
+- name: kill osdsdock containerized service\r
+  docker:\r
+    image: opensdsio/opensds-dock:latest\r
+    state: stopped\r
+  when: container_enabled == true\r
 \r
 - name: kill etcd daemon service\r
   shell: killall etcd\r
   ignore_errors: yes\r
-  when: db_driver == "etcd"\r
+  when: db_driver == "etcd" and container_enabled == false\r
+\r
+- name: kill etcd containerized service\r
+  docker:\r
+    image: {{ etcd_docker_image }}\r
+    state: stopped\r
+  when: db_driver == "etcd" and container_enabled == true\r
 \r
 - name: remove etcd service data\r
   file:\r
@@ -27,18 +48,41 @@
   ignore_errors: yes\r
   when: db_driver == "etcd"\r
 \r
-- name: kill osdslet daemon service\r
-  shell: killall osdslet\r
+- name: clean opensds release files\r
+  file:\r
+    path: "{{ opensds_dir }}"\r
+    state: absent\r
+    force: yes\r
   ignore_errors: yes\r
 \r
-- name: kill osdsdock daemon service\r
-  shell: killall osdsdock\r
+- name: clean opensds release tarball file\r
+  file:\r
+    path: "{{ opensds_tarball_url }}"\r
+    state: absent\r
+    force: yes\r
   ignore_errors: yes\r
 \r
-- name: clean all opensds build files\r
-  shell: . /etc/profile; make clean\r
-  args:\r
-    chdir: "{{ opensds_root_dir }}"\r
+- name: clean opensds flexvolume plugins binary file\r
+  file:\r
+    path: "{{ flexvolume_plugin_dir }}"\r
+    state: absent\r
+    force: yes\r
+  ignore_errors: yes\r
+  when: nbp_plugin_type == "flexvolume"\r
+\r
+- name: clean nbp release files\r
+  file:\r
+    path: "{{ nbp_dir }}"\r
+    state: absent\r
+    force: yes\r
+  ignore_errors: yes\r
+\r
+- name: clean nbp release tarball file\r
+  file:\r
+    path: "{{ nbp_tarball_url }}"\r
+    state: absent\r
+    force: yes\r
+  ignore_errors: yes\r
 \r
 - name: clean all opensds configuration files\r
   file:\r
@@ -61,19 +105,16 @@
   when: enabled_backend == "lvm"\r
 \r
 - name: remove a volume group if lvm backend specified\r
-  shell: vgremove {{ vg_name }}\r
+  lvg:\r
+    vg: "{{ vg_name }}"\r
+    state: absent\r
   when: enabled_backend == "lvm" and vg_existed.rc == 0\r
 \r
-- name: check if it existed before cleaning a physical volume\r
-  shell: pvdisplay {{ pv_device }}\r
-  ignore_errors: yes\r
-  register: pv_existed\r
+- name: remove physical volumes if lvm backend specified\r
+  shell: pvremove {{ item }}\r
+  with_items: "{{ pv_devices }}"\r
   when: enabled_backend == "lvm"\r
 \r
-- name: remove a physical volume if lvm backend specified\r
-  shell: pvremove {{ pv_device }}\r
-  when: enabled_backend == "lvm" and pv_existed.rc == 0\r
-\r
 - name: stop cinder-standalone service\r
   shell: docker-compose down\r
   become: true\r