From eb33f085b6058ed9b8476a42f98c00235a51e0b9 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 9 Dec 2016 16:33:10 +0100
Subject: [PATCH] Changes according to code review

---
 roles/reset/tasks/main.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
index 95eeb412e..bdacbbfc4 100644
--- a/roles/reset/tasks/main.yml
+++ b/roles/reset/tasks/main.yml
@@ -8,7 +8,9 @@
   failed_when: false
 
 - name: reset | remove services
-  file: path="/etc/systemd/system/{{item}}" state=absent
+  file:
+    path: "/etc/systemd/system/{{ item }}.service"
+    state: absent
   with_items:
     - kubelet
     - etcd
@@ -27,7 +29,7 @@
 
 - name: reset | unmount kubelet dirs
   command: umount {{item}}
-  with_items: '{{mounted_dirs.stdout_lines}}'
+  with_items: '{{ mounted_dirs.stdout_lines | reverse }}'
 
 - name: reset | delete some files and directories
   file: path={{ item }} state=absent
@@ -35,4 +37,11 @@
     - /etc/kubernetes/
     - /var/lib/kubelet
     - /var/lib/etcd
-
+    - /etc/ssl/etcd
+    - /var/log/calico
+    - /etc/cni
+    - /etc/nginx
+    - /etc/dnsmasq.d
+    - /etc/etcd.env
+    - /etc/calico
+    - /opt/cni