openstack
/
magnum
Code Issues Proposed changes

Support TimeoutStartSec for etcd and heat agent systemd services 

Now Magnum is using podman and systemd to manage the etcd service
and start heat-container-agent. In cases where the nodes pull images
from docker.io or another mirror registry with high latency, the etcd
or heat container agent service take long time to start, which is
causing timeout when bootstraping k8s cluster for fedora atomic/coreos
drivers. This patch fixes it by adding TimeoutStartSec for the systemd
services.

Task: 37452
Story: 2006459

Change-Id: I89855983f45544f202fc94ede396d1b0c44d286e
This commit is contained in:
Feilong Wang 2019-11-15 10:30:31 +13:00
parent 3d17c6eb49
commit 735fadf53c
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh
View File

@ -70,6 +70,7 @@ ExecStart=/bin/podman run \\
/usr/local/bin/etcd \\
--config-file /etc/etcd/etcd.conf.yaml
ExecStop=/bin/podman stop etcd
TimeoutStartSec=10min
[Install]
WantedBy=multi-user.target

1
magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh
View File

@ -84,6 +84,7 @@ ExecStart=/bin/podman run \\
${_prefix}heat-container-agent:${HEAT_CONTAINER_AGENT_TAG} \\
/usr/bin/start-heat-container-agent
ExecStop=/bin/podman stop heat-container-agent
TimeoutStartSec=10min
[Install]
WantedBy=multi-user.target