Merge pull request kubernetes#6135 from AntonioMeireles/master

getting 7bc7f47 fully right.
duda · Mar 30, 2015 · 4659a12 · 4659a12
2 parents 3e0cdff + bb4071e
commit 4659a12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docs/getting-started-guides/aws/cloud-configs/node.yaml b/docs/getting-started-guides/aws/cloud-configs/node.yaml
@@ -6,6 +6,7 @@ coreos:
     metadata: "role=node"
   flannel:
     interface: eth1
+    etcd_endpoints: http://<master-private-ip>:4001
   units:
     - name: etcd.service
       mask: true
@@ -16,9 +17,8 @@ coreos:
       drop-ins:
         - name: 50-network-config.conf
           content: |
-            [Unit]
-            Requires=etcd.service
             [Service]
+            ExecStartPre=/bin/bash -c "until curl http://<master-private-ip>:4001/v2/machines; do sleep 2; done"
             ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
     - name: docker.service
       command: start

diff --git a/docs/getting-started-guides/coreos/cloud-configs/node.yaml b/docs/getting-started-guides/coreos/cloud-configs/node.yaml
@@ -6,6 +6,7 @@ coreos:
     metadata: "role=node"
   flannel:
     interface: eth1
+    etcd_endpoints: http://<master-private-ip>:4001
   units:
     - name: etcd.service
       mask: true
@@ -16,9 +17,8 @@ coreos:
       drop-ins:
         - name: 50-network-config.conf
           content: |
-            [Unit]
-            Requires=etcd.service
             [Service]
+            ExecStartPre=/bin/bash -c "until curl http://<master-private-ip>:4001/v2/machines; do sleep 2; done"
             ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
     - name: docker.service
       command: start