From 86212d59ae09678d69edbf036aac731d5dd7f1c0 Mon Sep 17 00:00:00 2001
From: Iqbal Farabi <farabi.iqbal@gmail.com>
Date: Thu, 10 May 2018 10:10:59 +0530
Subject: [PATCH 1/2] Fix issue #2702: 'docker_bin_dir' is undefined when
 running ansible-playbook remove-node.yml

---
 remove-node.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/remove-node.yml b/remove-node.yml
index fbc5bc8ba..6d08dc5db 100644
--- a/remove-node.yml
+++ b/remove-node.yml
@@ -18,12 +18,15 @@
 
 - hosts: kube-master
   roles:
+    - { role: kubespray-defaults }
     - { role: remove-node/pre-remove, tags: pre-remove }
 
 - hosts: kube-node
   roles:
+    - { role: kubespray-defaults }
     - { role: reset, tags: reset }
 
 - hosts: kube-master
   roles:
+    - { role: kubespray-defaults }
     - { role: remove-node/post-remove, tags: post-remove }

From 52ffd5dae424ba95b8d1f442cde0c0b5e700c2f0 Mon Sep 17 00:00:00 2001
From: Iqbal Farabi <farabi.iqbal@gmail.com>
Date: Mon, 14 May 2018 07:20:45 +0530
Subject: [PATCH 2/2] Fix issue #2702: 'docker_bin_dir' is undefined when
 running ansible-playbook remove-node.yml

---
 remove-node.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/remove-node.yml b/remove-node.yml
index 6d08dc5db..80e3fed57 100644
--- a/remove-node.yml
+++ b/remove-node.yml
@@ -18,7 +18,6 @@
 
 - hosts: kube-master
   roles:
-    - { role: kubespray-defaults }
     - { role: remove-node/pre-remove, tags: pre-remove }
 
 - hosts: kube-node
@@ -28,5 +27,4 @@
 
 - hosts: kube-master
   roles:
-    - { role: kubespray-defaults }
     - { role: remove-node/post-remove, tags: post-remove }