workaround-systemd-1312.patch

commit 426024c6e2cc424fc958fab9245fc131ff67579a
Author: Oscar Morante <oscar.morante@mirada.tv>
Date:   Thu Sep 15 21:54:59 2016 +0300

    Workaround for systemd #1312

diff --git a/multi-node/aws/pkg/config/templates/cloud-config-controller b/multi-node/aws/pkg/config/templates/cloud-config-controller
index 24fa5b9..f5a4226 100644
--- a/multi-node/aws/pkg/config/templates/cloud-config-controller
+++ b/multi-node/aws/pkg/config/templates/cloud-config-controller
@@ -21,8 +21,8 @@ coreos:
         - name: 40-flannel.conf
           content: |
             [Unit]
-            Requires=flanneld.service
-            After=flanneld.service
+            Wants=flanneld.service
+            ExecStartPre=systemctl is-active flanneld.service
             [Service]
             EnvironmentFile=/etc/kubernetes/cni/docker_opts_cni.env
 
@@ -90,8 +90,8 @@ coreos:
         [Unit]
         Description=Load rkt stage1 images
         Documentation=http://github.com/coreos/rkt
-        Requires=network-online.target
-        After=network-online.target
+        Wants=network-online.target
+        ExecStartPre=systemctl is-active network-online.target
         Before=rkt-api.service
         [Service]
         Type=oneshot
@@ -107,8 +107,8 @@ coreos:
       content: |
         [Unit]
         Description=Calico per-host agent
-        Requires=network-online.target
-        After=network-online.target
+        Wants=network-online.target
+        ExecStartPre=systemctl is-active network-online.target
 
         [Service]
         Slice=machine.slice
@@ -137,8 +137,8 @@ coreos:
         [Unit]
         Description=decrypt kubelet tls assets using amazon kms
         Before=kubelet.service
-        After=docker.service
-        Requires=docker.service
+        ExecStartPre=systemctl is-active docker.service
+        Wants=docker.service
 
         [Service]
         Type=oneshot
@@ -152,8 +152,8 @@ coreos:
       command: start
       content: |
         [Unit]
-        Requires=kubelet.service docker.service
-        After=kubelet.service docker.service
+        Wants=kubelet.service docker.service
+        ExecStartPre=systemctl is-active kubelet.service docker.service
 
         [Service]
         Type=simple
@@ -167,8 +167,8 @@ coreos:
       command: start
       content: |
         [Unit]
-        Requires=kubelet.service docker.service
-        After=kubelet.service docker.service
+        Wants=kubelet.service docker.service
+        ExecStartPre=systemctl is-active kubelet.service docker.service
 
         [Service]
         Type=simple
diff --git a/multi-node/aws/pkg/config/templates/cloud-config-worker b/multi-node/aws/pkg/config/templates/cloud-config-worker
index 6f919d9..0a39ad1 100644
--- a/multi-node/aws/pkg/config/templates/cloud-config-worker
+++ b/multi-node/aws/pkg/config/templates/cloud-config-worker
@@ -11,8 +11,8 @@ coreos:
         - name: 40-flannel.conf
           content: |
             [Unit]
-            Requires=flanneld.service
-            After=flanneld.service
+            Wants=flanneld.service
+            ExecStartPre=systemctl is-active flanneld.service
             [Service]
             EnvironmentFile=/etc/kubernetes/cni/docker_opts_cni.env
 
@@ -74,8 +74,8 @@ coreos:
         [Unit]
         Description=Load rkt stage1 images
         Documentation=http://github.com/coreos/rkt
-        Requires=network-online.target
-        After=network-online.target
+        Wants=network-online.target
+        ExecStartPre=systemctl is-active network-online.target
         Before=rkt-api.service
         [Service]
         Type=oneshot
@@ -91,8 +91,8 @@ coreos:
       content: |
         [Unit]
         Description=Calico per-host agent
-        Requires=network-online.target
-        After=network-online.target
+        Wants=network-online.target
+        ExecStartPre=systemctl is-active network-online.target
 
         [Service]
         Slice=machine.slice
@@ -121,8 +121,8 @@ coreos:
         [Unit]
         Description=decrypt kubelet tls assets using amazon kms
         Before=kubelet.service
-        After=docker.service
-        Requires=docker.service
+        ExecStartPre=systemctl is-active docker.service
+        Wants=docker.service
 
         [Service]
         Type=oneshot

@spacepluk Definitely yes! FYI, the PR can be located at coreos/coreos-kubernetes#697