diff options
| author |   leonwang <wanghui71@huawei.com> | 2018-08-07 14:49:27 +0800 |
|---|---|---|
| committer | leonwang <wanghui71@huawei.com> | 2018-08-07 14:57:29 +0800 |
| commit | 91a84330494b100ac9077652c910fb248f737717 (patch) | |
| tree | 2c86151a5276e9e4ea9b2ea16e24adfd9f34fb5f /ci/ansible/roles/cleaner/tasks | |
| parent | 078bb837513f3b83fdd07f2e10f9abeb0bd485db (diff) | |
Update the latest version of ansible script
This patch is proposed for merging the latest version of
ansible code according to opensds-installer project.
From the latest version code, we change the default
installation way from source code to release, which means
there is no need for golang environment prepare and
long-time building work.
Change-Id: I93d7d24f29e61979bc8fda7125ae753063eda423
Signed-off-by: leonwang <wanghui71@huawei.com>
Diffstat (limited to 'ci/ansible/roles/cleaner/tasks')
| -rw-r--r-- | ci/ansible/roles/cleaner/tasks/main.yml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ci/ansible/roles/cleaner/tasks/main.yml b/ci/ansible/roles/cleaner/tasks/main.yml index 8399b08..ed887c6 100644 --- a/ci/ansible/roles/cleaner/tasks/main.yml +++ b/ci/ansible/roles/cleaner/tasks/main.yml @@ -14,7 +14,7 @@ - name: kill osdslet daemon service
shell: killall osdslet osdsdock
- when: container_enabled == false
+ when: install_from != "container"
ignore_errors: true
- name: kill osdslet containerized service
@@ -22,14 +22,14 @@ name: osdslet
image: "{{ controller_docker_image }}"
state: stopped
- when: container_enabled == true
+ when: install_from == "container"
- name: kill osdsdock containerized service
docker_container:
name: osdsdock
image: "{{ dock_docker_image }}"
state: stopped
- when: container_enabled == true
+ when: install_from == "container"
- name: stop container where dashboard is located
docker_container:
@@ -46,6 +46,15 @@ ignore_errors: yes
when: nbp_plugin_type == "flexvolume"
+- name: clean opensds external provisioner plugin if flexvolume specified
+ shell: |
+ . /etc/profile
+ kubectl delete -f deploy/
+ args:
+ chdir: "{{ nbp_work_dir }}/provisioner"
+ ignore_errors: yes
+ when: nbp_plugin_type == "flexvolume"
+
- name: clean opensds csi plugin if csi plugin specified
shell: |
. /etc/profile
|