Skip to content

Commit b93df9a

Browse files
Matthew Fishercarmstrong
authored andcommitted
fix(scheduler): remove arping hack
This is no longer required for v1.0.0
1 parent 4501c35 commit b93df9a

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

controller/scheduler/coreos.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,7 @@ def attach(self, name):
197197
[Service]
198198
ExecStartPre=/usr/bin/docker pull {image}
199199
ExecStartPre=/bin/sh -c "docker inspect {name} >/dev/null 2>&1 && docker rm -f {name} || true"
200-
ExecStart=/bin/sh -c "port=$(docker inspect -f '{{{{range $k, $v := .config.ExposedPorts }}}}{{{{$k}}}}{{{{end}}}}' {image} | cut -d/ -f1) ; /usr/bin/docker run --name {name} -P -e PORT=$port {image} {command}"
201-
ExecStartPost=/bin/sh -c "until docker inspect {name} >/dev/null 2>&1; do sleep 1; done"; \
202-
/bin/sh -c "arping -Idocker0 -c1 `docker inspect -f '{{{{ .NetworkSettings.IPAddress }}}}' {name}`"
200+
ExecStart=/bin/sh -c "port=$(docker inspect -f '{{{{range $k, $v := .config.ExposedPorts }}}}{{{{$k}}}}{{{{end}}}}' {image} | cut -d/ -f1) ; docker run --name {name} -P -e PORT=$port {image} {command}"
203201
ExecStop=/usr/bin/docker rm -f {name}
204202
TimeoutStartSec=20m
205203
"""
@@ -225,8 +223,8 @@ def attach(self, name):
225223
BindsTo={name}.service
226224
227225
[Service]
228-
ExecStartPre=/bin/sh -c "until /usr/bin/docker inspect {name} >/dev/null 2>&1; do sleep 1; done"
229-
ExecStart=/bin/sh -c "/usr/bin/docker logs -f {name} 2>&1 | logger -p local0.info -t {app}[{c_type}.{c_num}] --udp --server $(etcdctl get /deis/logs/host | cut -d ':' -f1) --port $(etcdctl get /deis/logs/port | cut -d ':' -f2)"
226+
ExecStartPre=/bin/sh -c "until docker inspect {name} >/dev/null 2>&1; do sleep 1; done"
227+
ExecStart=/bin/sh -c "docker logs -f {name} 2>&1 | logger -p local0.info -t {app}[{c_type}.{c_num}] --udp --server $(etcdctl get /deis/logs/host | cut -d ':' -f1) --port $(etcdctl get /deis/logs/port | cut -d ':' -f2)"
230228
231229
[X-Fleet]
232230
X-ConditionMachineOf={name}.service

0 commit comments

Comments
 (0)