[PR #6105/81b16a88 backport][stable-6] nmcli: fixed idempotency issue…

… when config bridge connection (#6243) nmcli: fixed idempotency issue when config bridge connection (#6105) * nmcli: fixed idempotency issue when config bridge connection * Update changelog fragment. --------- Co-authored-by: Felix Fontein <[email protected]> (cherry picked from commit 81b16a8) Co-authored-by: Sam Potekhin <[email protected]>
ansible-collections · Mar 26, 2023 · 3432be3 · 3432be3
1 parent 4f78e79
commit 3432be3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/changelogs/fragments/3216-nmcli-bridge-idempotency-fix.yml b/changelogs/fragments/3216-nmcli-bridge-idempotency-fix.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - nmcli - fixed idempotency issue for bridge connections. Module forced default value of ``bridge.priority`` to nmcli if not set; if ``bridge.stp`` is disabled nmcli ignores it and keep default (https://github.com/ansible-collections/community.general/issues/3216, https://github.com/ansible-collections/community.general/issues/4683).
diff --git a/plugins/modules/nmcli.py b/plugins/modules/nmcli.py
@@ -1629,6 +1629,10 @@ def connection_options(self, detect_change=False):
                 'bridge.priority': self.priority,
                 'bridge.stp': self.stp,
             })
+            # priority make sense when stp enabed, otherwise nmcli keeps bridge-priority to 32768 regrdless of input.
+            # force ignoring to save idempotency
+            if self.stp:
+                options.update({'bridge.priority': self.priority})
         elif self.type == 'team':
             options.update({
                 'team.runner': self.runner,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- nmcli - fixed idempotency issue for bridge connections. Module forced default value of ``bridge.priority`` to nmcli if not set; if ``bridge.stp`` is disabled nmcli ignores it and keep default (https://github.com/ansible-collections/community.general/issues/3216, https://github.com/ansible-collections/community.general/issues/4683).