Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nmcli: fixed idempotency issue when config bridge connection #6105

Merged
merged 2 commits into from
Mar 26, 2023
+6 −0
Merged

nmcli: fixed idempotency issue when config bridge connection #6105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45abf87
nmcli: fixed idempotency issue when config bridge connection
heaveaxy Feb 26, 2023
de2ee5a
Update changelog fragment.
felixfontein Mar 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/3216-nmcli-bridge-idempotency-fix.yml
View file
Open in desktop
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).
4 changes: 4 additions & 0 deletions plugins/modules/nmcli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1615,6 +1615,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,
Expand Down