X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ocd%2Finfra%2Fplaybooks%2Froles%2Feg_mep%2Ftasks%2Funinstall.yml;h=3cf66ef49cf9599eba123a9c92efd657a7dd7b04;hb=3c1bb1c727ca416486ab96384557ee3d12acf1e9;hp=99203f6da2e95f11af2ff405c3b4d610119d6164;hpb=5a96855385ed2fe197daea2d3f128d7fbd534998;p=ealt-edge.git

diff --git a/ocd/infra/playbooks/roles/eg_mep/tasks/uninstall.yml b/ocd/infra/playbooks/roles/eg_mep/tasks/uninstall.yml
index 99203f6..3cf66ef 100644
--- a/ocd/infra/playbooks/roles/eg_mep/tasks/uninstall.yml
+++ b/ocd/infra/playbooks/roles/eg_mep/tasks/uninstall.yml
@@ -35,6 +35,11 @@
   ignore_errors: yes
   no_log: True
 
+- name: Delete dns namesapce metallb
+  command: kubectl delete secret memberlist -n metallb-system
+  ignore_errors: yes
+  no_log: True
+
 - name: Delete ssl config namesapce mep
   command: kubectl delete ns mep
   ignore_errors: yes
@@ -42,96 +47,61 @@
 
 - name: Delete network isolation multus eg sp controller
   # yamllint disable rule:line-length
-  command: kubectl delete -f /tmp/eg_mep/deploy/edge/network-isolation/eg-sp-controller.yaml
-  args:
-    chdir: /tmp/eg_mep/deploy/
+  command: kubectl delete -f /tmp/eg_mep/deploy/conf/edge/network-isolation/eg-sp-controller.yaml
   ignore_errors: yes
   no_log: True
 
 - name: Delete network isolation multus eg sp rbac
   # yamllint disable rule:line-length
   command: kubectl delete -f /tmp/eg_mep/deploy/conf/edge/network-isolation/eg-sp-rbac.yaml
-  args:
-    chdir: /tmp/eg_mep/deploy/
   ignore_errors: yes
   no_log: True
 
 - name: Delete network isolation multus
   # yamllint disable rule:line-length
   command: kubectl delete -f /tmp/eg_mep/deploy/conf/edge/network-isolation/multus.yaml
-  args:
-    chdir: /tmp/eg_mep/deploy/
-  ignore_errors: yes
-  no_log: True
-
-- name: Delete network isolation rm host local
-  # yamllint disable rule:line-length
-  command: rm /opt/cni/bin/macvlan /opt/cni/bin/host-local
-  args:
-    chdir: /tmp/remote-platform/
   ignore_errors: yes
   no_log: True
 
 - name: Delete network isolation eg mp1
   command: ip link set dev eg-mp1 down
-  args:
-    chdir: /tmp/remote-platform/
   ignore_errors: yes
   no_log: True
 
 - name: Delete nnetwork isolation eg mp1 link
   command: ip link delete eg-mp1
-  args:
-    chdir: /tmp/remote-platform/
   ignore_errors: yes
   no_log: True
 
 - name: Delete network isolation eg mm5
   command: ip link set dev eg-mm5 down
-  args:
-    chdir: /tmp/remote-platform/
   ignore_errors: yes
   no_log: True
 
 - name: Delete network isolation eg mm5 link
   command: ip link delete eg-mm5
-  args:
-    chdir: /tmp/remote-platform/
   ignore_errors: yes
   no_log: True
 
 - name: Delete network isolation multus rm
-  command: rm /opt/cni/bin/multus
-  args:
-    chdir: /tmp/remote-platform/
+  command: rm -rf /opt/cni/bin/multus
   ignore_errors: yes
   no_log: True
 
 - name: Uninstall dns metallb config mep
   # yamllint disable rule:line-length
   command: kubectl delete -f /tmp/eg_mep/deploy/conf/edge/metallb/config-map.yaml
-  args:
-    chdir: /tmp/eg_mep/deploy/
   ignore_errors: yes
   no_log: True
 
 - name: Delete dns metallb
   # yamllint disable rule:line-length
   command: kubectl delete -f /tmp/eg_mep/deploy/conf/edge/metallb/metallb.yaml
-  args:
-    chdir: /tmp/eg_mep/deploy/
   ignore_errors: yes
   no_log: True
 
 - name: Delete dns metallb namespace
   # yamllint disable rule:line-length
   command: kubectl delete -f /tmp/eg_mep/deploy/conf/edge/metallb/namespace.yaml
-  args:
-    chdir: /tmp/eg_mep/deploy/
-  ignore_errors: yes
-  no_log: True
-
-- name: Delete dns namesapce metallb
-  command: kubectl delete secret memberlist -n metallb-system
   ignore_errors: yes
   no_log: True