github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4524 from pires/coreos_etcd_waiter_requirements

Browse Source 
Removed rule that defined etcd waiter to happen before setup-network-environment
This commit is contained in:
Brendan Burns 2015-02-20 15:42:58 -08:00
commit daeadc15a9
4 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/getting-started-guides/aws/cloud-configs/master.yaml
View File

@ -79,7 +79,6 @@ coreos:
After=etcd.service After=etcd.service
After=network-online.target After=network-online.target
Before=flannel.service Before=flannel.service
Before=setup-network-environment.service
[Service] [Service]
ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh

3
docs/getting-started-guides/aws/cloudformation-template.json
View File

@ -208,8 +208,7 @@
" Wants=etcd.service\n", " Wants=etcd.service\n",
" After=etcd.service\n", " After=etcd.service\n",
" After=network-online.target\n", " After=network-online.target\n",
" Before=flannel.service\n", " Before=flannel.service\n\n",
" Before=setup-network-environment.service\n\n",
" [Service]\n", " [Service]\n",
" ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh\n",
" ExecStart=/usr/bin/bash /opt/bin/waiter.sh\n", " ExecStart=/usr/bin/bash /opt/bin/waiter.sh\n",

1
docs/getting-started-guides/coreos/cloud-configs/master.yaml
View File

@ -79,7 +79,6 @@ coreos:
After=etcd.service After=etcd.service
After=network-online.target After=network-online.target
Before=flannel.service Before=flannel.service
Before=setup-network-environment.service
[Service] [Service]
ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh

1
docs/getting-started-guides/coreos/cloud-configs/standalone.yaml
View File

@ -24,7 +24,6 @@ coreos:
After=etcd.service After=etcd.service
After=network-online.target After=network-online.target
Before=flannel.service Before=flannel.service
Before=setup-network-environment.service
[Service] [Service]
ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh