Merge pull request #4524 from pires/coreos_etcd_waiter_requirements

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

View File

@ -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

View File

@ -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",

View File

@ -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

View File

@ -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