ansible/ansible-podman-collections
1
0
Fork 0
mirror of https://github.com/containers/ansible-podman-collections.git synced 2026-02-04 07:11:49 +00:00
Code Activity

Fix idempotency with systemd podman files (#278)

Browse source 
Fix #276
Label 'podman_systemd_unit' is the marker for container starting
from systemd generated file. In this case:
* Ignore podman_systemd_unit label
* Ignore cidfile settings when this label presents
This commit is contained in:
Sergey 2021-08-02 12:59:43 +03:00 • committed by GitHub
parent d1698121a9
commit ed681ef10e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/module_utils/podman/podman_container_lib.py
View file

@ -759,6 +759,11 @@ class PodmanContainerDiff:
def diffparam_cidfile(self):
before = self.info['hostconfig']['containeridfile']
after = self.params['cidfile']
labels = self.info['config']['labels'] or {}
# Ignore cidfile that is coming from systemd files
# https://github.com/containers/ansible-podman-collections/issues/276
if 'podman_systemd_unit' in labels:
after = before
return self._diff_update_and_compare('cidfile', before, after)
def diffparam_command(self):
@ -924,6 +929,11 @@ class PodmanContainerDiff:
str(k).lower(): str(v)
for k, v in self.params['label'].items()
})
# Strip out labels that are coming from systemd files
# https://github.com/containers/ansible-podman-collections/issues/276
if 'podman_systemd_unit' in before:
after.pop('podman_systemd_unit', None)
before.pop('podman_systemd_unit', None)
return self._diff_update_and_compare('label', before, after)
def diffparam_log_driver(self):