From e07903a5cf86fb9c8b04a4b38eb99a8dad86354b Mon Sep 17 00:00:00 2001
From: Xan Manning <xan.manning@gmail.com>
Date: Tue, 21 Jan 2020 22:33:11 +0000
Subject: [PATCH] Fixed issue with SUSE docker installation

---
 tasks/state-installed.yml | 5 ++++-
 vagrant/Vagrantfile       | 2 +-
 vagrant/inventory.yml     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tasks/state-installed.yml b/tasks/state-installed.yml
index e4f1d1d..0747236 100644
--- a/tasks/state-installed.yml
+++ b/tasks/state-installed.yml
@@ -23,7 +23,10 @@
         and (k3s_non_root is not defined or not k3s_non_root)
 
 - include_tasks: build/install-docker-{{ ansible_distribution | replace(" ", "-") | lower }}.yml
-  when: ansible_distribution | replace(" ", "-") | lower in ['amazon', 'suse', 'opensuse-leap']
+  when: k3s_use_docker
+        and ((k3s_control_workers)
+           or (not k3s_control_workers and not k3s_control_node))
+        and ansible_distribution | replace(" ", "-") | lower in ['amazon', 'suse', 'opensuse-leap']
         and (k3s_non_root is not defined or not k3s_non_root)
 
 - import_tasks: build/download-k3s.yml
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index ed318fb..c3adc2b 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -30,7 +30,7 @@ $opensuse_provision = <<SCRIPT
 if [ ! -f .vagrant_provision ] ; then
     echo "Installing dependencies ..."
     sudo zypper refresh > /dev/null 2>&1 && echo "[OK] Update Zypper cache."
-    sudo zypper install -y python > /dev/null 2>&1 && \
+    sudo zypper install -y python python-xml > /dev/null 2>&1 && \
         echo "[OK] Installing Python."
     touch .vagrant_provision
 else
diff --git a/vagrant/inventory.yml b/vagrant/inventory.yml
index cfe98f7..a0e2233 100644
--- a/vagrant/inventory.yml
+++ b/vagrant/inventory.yml
@@ -3,7 +3,7 @@
 all:
   vars:
     ansible_become: true
-    k3s_ensure_docker_installed: false
+    k3s_use_docker: false
 
 k3s_nodes:
   hosts: