From 55ab6bf49f62ee9c4427c873cda2ff4af62ffecc Mon Sep 17 00:00:00 2001
From: Adrian Stadelmann <ast@scaling.ch>
Date: Wed, 11 Sep 2019 08:22:42 +0200
Subject: [PATCH] task-12421 Adapt kubespray to be able to handle new OS -
 docker is preinstalled with fedora coreos, needs to be disabled  
 https://github.com/coreos/fedora-coreos-tracker/issues/229

---
 .../templates/ignition/baremetal-worker.yaml.j2    | 14 ++++++++++++++
 .../matchbox/templates/ignition/controller.yaml.j2 | 14 ++++++++++++++
 .../matchbox/templates/ignition/worker.yaml.j2     | 14 ++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/jaso_playbooks/roles/matchbox/templates/ignition/baremetal-worker.yaml.j2 b/jaso_playbooks/roles/matchbox/templates/ignition/baremetal-worker.yaml.j2
index 197e216f5a4..562f11df82b 100644
--- a/jaso_playbooks/roles/matchbox/templates/ignition/baremetal-worker.yaml.j2
+++ b/jaso_playbooks/roles/matchbox/templates/ignition/baremetal-worker.yaml.j2
@@ -2,6 +2,20 @@
 variant: fcos
 version: 1.0.0
 
+#a ugly way to disable docker https://github.com/coreos/fedora-coreos-tracker/issues/229
+systemd:
+  units:
+    - name: docker.service
+      enabled: false
+      contents: |
+        [Unit]
+        Description=disable docker
+
+        [Service]
+
+        [Install]
+        WantedBy=multi-user.target
+
 storage:
   disks:
     - device: /dev/nvme0n1
diff --git a/jaso_playbooks/roles/matchbox/templates/ignition/controller.yaml.j2 b/jaso_playbooks/roles/matchbox/templates/ignition/controller.yaml.j2
index fada3979a48..8e9bc777de0 100644
--- a/jaso_playbooks/roles/matchbox/templates/ignition/controller.yaml.j2
+++ b/jaso_playbooks/roles/matchbox/templates/ignition/controller.yaml.j2
@@ -2,6 +2,20 @@
 variant: fcos
 version: 1.0.0
 
+#a ugly way to disable docker https://github.com/coreos/fedora-coreos-tracker/issues/229
+systemd:
+  units:
+    - name: docker.service
+      enabled: false
+      contents: |
+        [Unit]
+        Description=disable docker
+
+        [Service]
+
+        [Install]
+        WantedBy=multi-user.target
+
 storage:
   files:
     - path: /etc/sysctl.d/max-user-watches.conf
diff --git a/jaso_playbooks/roles/matchbox/templates/ignition/worker.yaml.j2 b/jaso_playbooks/roles/matchbox/templates/ignition/worker.yaml.j2
index c5dfe763fc9..2ee70f463e7 100644
--- a/jaso_playbooks/roles/matchbox/templates/ignition/worker.yaml.j2
+++ b/jaso_playbooks/roles/matchbox/templates/ignition/worker.yaml.j2
@@ -2,6 +2,20 @@
 variant: fcos
 version: 1.0.0
 
+#a ugly way to disable docker https://github.com/coreos/fedora-coreos-tracker/issues/229
+systemd:
+  units:
+    - name: docker.service
+      enabled: false
+      contents: |
+        [Unit]
+        Description=disable docker
+
+        [Service]
+
+        [Install]
+        WantedBy=multi-user.target
+
 storage:
   files:
     - path: /etc/sysctl.d/max-user-watches.conf