diff options
| author | Tikhon Masalov <t.masalov@maxima-int.com> | 2026-08-31 16:51:09 +0400 |
|---|---|---|
| committer | Tikhon Masalov <t.masalov@maxima-int.com> | 2026-09-10 11:23:31 +0000 |
| commit | 89e9c59d49e944c315ef43d3ddf227ebbf625968 (patch) | |
| tree | b212f33e170c9f0ed6ac3dcd8df5e883bdf61b35 /ansible/module_utils | |
| parent | 7539643ee1cd07785ea6b6e370619bc282881c4b (diff) | |
| download | kolla-ansible-89e9c59d49e944c315ef43d3ddf227ebbf625968.tar.gz kolla-ansible-89e9c59d49e944c315ef43d3ddf227ebbf625968.zip | |
Fix trailing comma bug in DockerWorker.generate_tls()
In generate_tls(), tls_cert and tls_key were assigned with trailing
commas, which caused them to become single-element tuples (None,)
instead of None. This made the if tls_cert: check always true,
leading to TypeError when check_file() received a tuple instead
of a string path.
Remove the trailing commas so tls_cert and tls_key are plain values.
Remove TestTLS.setUp(_get_host_timezone) for stable branches:
_get_host_timezone does not exist in kolla_container_worker.py
on older branches, causing AttributeError in TestTLS setUp.
Closes-Bug: #2166845
Change-Id: I06b8876838ee2ec3c20c9a98448fc9e5588f32cd
Signed-off-by: Tikhon Masalov <t.masalov@maxima-int.com>
(cherry picked from commit 2f8958235bc16a89a33c0711f1dfcb7bca87a1a9)
Diffstat (limited to 'ansible/module_utils')
| -rw-r--r-- | ansible/module_utils/kolla_docker_worker.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/module_utils/kolla_docker_worker.py b/ansible/module_utils/kolla_docker_worker.py index f488bab66..db41d5599 100644 --- a/ansible/module_utils/kolla_docker_worker.py +++ b/ansible/module_utils/kolla_docker_worker.py @@ -41,8 +41,8 @@ class DockerWorker(ContainerWorker): def generate_tls(self): tls = {'verify': self.params.get('tls_verify')} - tls_cert = self.params.get('tls_cert'), - tls_key = self.params.get('tls_key'), + tls_cert = self.params.get('tls_cert') + tls_key = self.params.get('tls_key') tls_cacert = self.params.get('tls_cacert') if tls['verify']: |