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

podman-pod: Fix idempotency for pods in 4.4.x versions (#593)

Browse source 
Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>
This commit is contained in:
Sergey 2023-05-30 19:52:51 +03:00 • committed by GitHub
parent e5b37d9756
commit 45e1de2bfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/module_utils/podman/podman_pod_lib.py
View file

@ -443,6 +443,15 @@ class PodmanPodDiff:
net_mode_before = net_mode_before.replace('bridge', 'default')
net_mode_before = net_mode_before.replace('slirp4netns', 'default')
return self._diff_update_and_compare('network', net_mode_before, net_mode_after)
# For 4.4.0+ podman versions with no network specified
if not net_mode_after and net_mode_before == 'slirp4netns' and not after:
net_mode_after = 'slirp4netns'
if before == ['slirp4netns']:
after = ['slirp4netns']
if not net_mode_after and net_mode_before == 'bridge' and not after:
net_mode_after = 'bridge'
if before == ['bridge']:
after = ['bridge']
before, after = sorted(list(set(before))), sorted(list(set(after)))
return self._diff_update_and_compare('network', before, after)