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 with 'may_fail4' when 'method' is 'disabled' #6106

Merged
merged 3 commits into from
Mar 26, 2023
Merged

nmcli: fixed idempotency issue with 'may_fail4' when 'method' is 'disabled' #6106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1f828c
nmcli: fixed idempotency issue with 'may_fail4' when 'method' is 'dis…
heaveaxy Feb 26, 2023
1d76f30
updated changelog fragment
heaveaxy Feb 26, 2023
739c0df
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/6106-nmcli-ipv4-mayfail-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 when module params is set to ``may_fail4=false`` and ``method4=disabled``; in this case nmcli ignores change and keeps their own default value ``yes`` (https://github.com/ansible-collections/community.general/pull/6106).
5 changes: 5 additions & 0 deletions plugins/modules/nmcli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
may_fail4:
description:
- If you need I(ip4) configured before C(network-online.target) is reached, set this option to C(false).
- This option applies when C(method4) is not C(disabled).
type: bool
default: true
version_added: 3.3.0
Expand Down Expand Up @@ -1576,6 +1577,10 @@ def connection_options(self, detect_change=False):
'ipv6.ip6-privacy': self.ip_privacy6,
'ipv6.addr-gen-mode': self.addr_gen_mode6
})
# when 'method' is disabled the 'may_fail' no make sense but accepted by nmcli with keeping 'yes'
# force ignoring to save idempotency
if self.ipv4_method and self.ipv4_method != 'disabled':
options.update({'ipv4.may-fail': self.may_fail4})

# Layer 2 options.
if self.mac:
Expand Down