task-12421 Adapt kubespray to be able to handle new OS

- docker is preinstalled with fedora coreos, needs to be disabled coreos/fedora-coreos-tracker#229
spaced · Sep 11, 2019 · 55ab6bf · 55ab6bf
1 parent 4b6de2e
commit 55ab6bf
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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