Merge pull request #1049 from shanejonas/fix-container-template-timeout

use 20m timeout for docker container template

Author: Matthew Fisher

controller/scheduler/coreos.py

@@ -201,6 +201,7 @@ def attach(self, name):
 ExecStartPost=/bin/sh -c "until docker inspect {name} >/dev/null 2>&1; do sleep 1; done"; \
     /bin/sh -c "arping -Idocker0 -c1 `docker inspect -f '{{{{ .NetworkSettings.IPAddress }}}}' {name}`"
 ExecStop=/usr/bin/docker rm -f {name}
+TimeoutStartSec=20m
 """
 
 ANNOUNCE_TEMPLATE = """