Browse Source

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

changes/46/691646/4
Zuul 2 weeks ago
parent
commit
9e8b058c44
2 changed files with 2 additions and 0 deletions
  1. +1
    -0
      magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh
  2. +1
    -0
      magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh

+ 1
- 0
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
- 0
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

Loading…
Cancel
Save