Don't import "start_timeout" in the task.docker and task.podman keywords

All container.docker keywords were imported, but tasks use "timeout" instead of "start_timeout".
opensvc · Jun 10, 2020 · 3fca485 · 3fca485
1 parent f89b90c
commit 3fca485
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/opensvc/drivers/resource/task/docker/__init__.py b/opensvc/drivers/resource/task/docker/__init__.py
@@ -11,7 +11,7 @@
 DRIVER_GROUP = "task"
 DRIVER_BASENAME = "docker"
 DRIVER_BASENAME_ALIASES = ["oci"]
-KEYWORDS = BASE_KEYWORDS + DOCKER_KEYWORDS
+KEYWORDS = BASE_KEYWORDS + [kw for kw in DOCKER_KEYWORDS if kw["keyword"] != "start_timeout"]
 DEPRECATED_KEYWORDS = {
     "task.docker.run_image": "image",
     "task.docker.run_command": "command",

diff --git a/opensvc/drivers/resource/task/podman/__init__.py b/opensvc/drivers/resource/task/podman/__init__.py
@@ -11,7 +11,7 @@
 DRIVER_GROUP = "task"
 DRIVER_BASENAME = "podman"
 DRIVER_BASENAME_ALIASES = ["oci"]
-KEYWORDS = BASE_KEYWORDS + PODMAN_KEYWORDS
+KEYWORDS = BASE_KEYWORDS + [kw for kw in DOCKER_KEYWORDS if kw["keyword"] != "start_timeout"]
 DEPRECATED_KEYWORDS = {
     "task.podman.run_image": "image",
     "task.podman.run_command": "command",