Commit daeadc15 authored by Brendan Burns's avatar Brendan Burns

Merge pull request #4524 from pires/coreos_etcd_waiter_requirements

Removed rule that defined etcd waiter to happen before setup-network-environment
parents 9829128a cd0082ab
......@@ -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
......
......@@ -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",
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment