openstack
/
magnum
Code Issues Proposed changes

Merge "Support TimeoutStartSec for etcd and heat agent systemd services"

This commit is contained in:
Zuul 2019-11-21 22:52:28 +00:00 committed by Gerrit Code Review
parent 8f2a324984 735fadf53c
commit 9e8b058c44
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 \\ /usr/local/bin/etcd \\
--config-file /etc/etcd/etcd.conf.yaml --config-file /etc/etcd/etcd.conf.yaml
ExecStop=/bin/podman stop etcd ExecStop=/bin/podman stop etcd
TimeoutStartSec=10min
[Install] [Install]
WantedBy=multi-user.target 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} \\ ${_prefix}heat-container-agent:${HEAT_CONTAINER_AGENT_TAG} \\
/usr/bin/start-heat-container-agent /usr/bin/start-heat-container-agent
ExecStop=/bin/podman stop heat-container-agent ExecStop=/bin/podman stop heat-container-agent
TimeoutStartSec=10min
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target