From 69cdc6dbc8b7bcc5ebffbe9ec7c84e5d4ad5c839 Mon Sep 17 00:00:00 2001
From: Martin Hiner <martin.hiner@tietoevry.com>
Date: Mon, 27 May 2024 14:16:17 +0200
Subject: [PATCH] Fix missing commas in kolla_podman_worker
List of strings CONTAINER_PARAMS is missing comma separators,
which makes it an implicit concatenation of list items
that should be separate.
Closes-Bug: #2067278
Change-Id: Iec9a8de184481dae058377fa8d7bbd8da729d62c
Signed-off-by: Martin Hiner <martin.hiner@tietoevry.com>
---
ansible/module_utils/kolla_podman_worker.py | 6 +++---
releasenotes/notes/bug-2067278-82287115c972a04e.yaml | 7 +++++++
2 files changed, 10 insertions(+), 3 deletions(-)
create mode 100644 releasenotes/notes/bug-2067278-82287115c972a04e.yaml
diff --git a/ansible/module_utils/kolla_podman_worker.py b/ansible/module_utils/kolla_podman_worker.py
index 9e27dece4f..1f9b57067e 100644
--- a/ansible/module_utils/kolla_podman_worker.py
+++ b/ansible/module_utils/kolla_podman_worker.py
@@ -30,12 +30,12 @@ CONTAINER_PARAMS = [
'cpu_period', # int
'cpu_quota', # int
'cpuset_cpus', # str
- 'cpu_shares' # int
+ 'cpu_shares', # int
'cpuset_mems', # str
'kernel_memory', # int or string
'mem_limit', # (Union[int, str])
'mem_reservation', # (Union[int, str]): Memory soft limit.
- 'memswap_limit' # (Union[int, str]): Maximum amount of memory
+ 'memswap_limit', # (Union[int, str]): Maximum amount of memory
# + swap a container is allowed to consume.
'ulimits', # List[Ulimit]
'blkio_weight', # int between 10 and 1000
@@ -58,7 +58,7 @@ CONTAINER_PARAMS = [
'remove', # bool
'restart_tries', # int doesn't matter done by systemd
'stop_timeout', # int
- 'tty' # bool
+ 'tty', # bool
# VOLUMES NOT WORKING HAS TO BE DONE WITH MOUNTS
'volumes', # array of dict
'volumes_from', # array of strings
diff --git a/releasenotes/notes/bug-2067278-82287115c972a04e.yaml b/releasenotes/notes/bug-2067278-82287115c972a04e.yaml
new file mode 100644
index 0000000000..a79400c9fd
--- /dev/null
+++ b/releasenotes/notes/bug-2067278-82287115c972a04e.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+ - |
+ Fixes a bug in kolla_podman_worker, where missing commas
+ in list of strings create implicit concatenation of items
+ that should be separate.
+ `LP#2067278 <https://launchpad.net/bugs/2067278>`__
--
GitLab