Merge pull request kubernetes#4524 from pires/coreos_etcd_waiter_requ…

…irements Removed rule that defined etcd waiter to happen before setup-network-environment
satnam6502 · Feb 20, 2015 · daeadc1 · daeadc1
2 parents 9829128 + cd0082a
commit daeadc1
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 5 deletions.
diff --git a/docs/getting-started-guides/aws/cloud-configs/master.yaml b/docs/getting-started-guides/aws/cloud-configs/master.yaml
@@ -79,7 +79,6 @@ coreos:
         After=etcd.service
         After=network-online.target
         Before=flannel.service
-        Before=setup-network-environment.service
 
         [Service]
         ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh

diff --git a/docs/getting-started-guides/aws/cloudformation-template.json b/docs/getting-started-guides/aws/cloudformation-template.json
@@ -208,8 +208,7 @@
           "        Wants=etcd.service\n",
           "        After=etcd.service\n",
           "        After=network-online.target\n",
-          "        Before=flannel.service\n",
-          "        Before=setup-network-environment.service\n\n",
+          "        Before=flannel.service\n\n",
           "        [Service]\n",
           "        ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh\n",
           "        ExecStart=/usr/bin/bash /opt/bin/waiter.sh\n",

diff --git a/docs/getting-started-guides/coreos/cloud-configs/master.yaml b/docs/getting-started-guides/coreos/cloud-configs/master.yaml
@@ -79,7 +79,6 @@ coreos:
         After=etcd.service
         After=network-online.target
         Before=flannel.service
-        Before=setup-network-environment.service
 
         [Service]
         ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh

diff --git a/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml b/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml
@@ -24,7 +24,6 @@ coreos:
         After=etcd.service
         After=network-online.target
         Before=flannel.service
-        Before=setup-network-environment.service
 
         [Service]
         ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh