internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-13 04:11:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipa_host: fix errors when disabling host (#11487)

Browse Source 
* fix errors when disabling host

- Fix the logic to actually allow disabling hosts
- Fix the dict != string error when error does happen
- Add has_keytab to returned dicts to allow users see if host is disabled or not

* Add changelog-fragments

* Run formatters

* More formatting

* Remove feature, only fix the logic

* Update changelogs/fragments/11487-ipa-host-fix-disable.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update changelogs/fragments/11487-ipa-host-fix-disable.yml

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>

* Back to fstring

* Update plugins/modules/ipa_host.py

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>

* Use more Pythonic way to for if

* Nox

* Revert back to working if

* Simplify if

* Remove extra get

---------

Co-authored-by: quasd <1747330+quasd@users.noreply.github.com>
Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
quasd
2026-04-12 14:08:28 +03:00
committed by GitHub
parent c7deda2ec7
commit 5eaa22b067
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/11487-ipa-host-fix-disable.yml Normal file
View File

@@ -0,0 +1,2 @@
bugfixes:
- ipa_host - fix logic to disable existing hosts (https://github.com/ansible-collections/community.general/issues/11483, https://github.com/ansible-collections/community.general/pull/11487).

20
plugins/modules/ipa_host.py
View File

@@ -289,11 +289,15 @@ def ensure(module, client):
# so, return directly from here.
return changed, client.host_add(name=name, host=module_host)
else:
if state in ["disabled", "enabled"]:
module.fail_json(msg=f"No host with name {ipa_host} found")
if not ipa_host and state in ["disabled", "enabled"]:
module.fail_json(msg=f"No host with name {name} found")
diff = get_host_diff(client, ipa_host, module_host)
if len(diff) > 0:
ipa_host_show = client.host_show(name=name)
host_needs_to_be_disabled = ipa_host_show.get("has_keytab", True) and (
module.params["random_password"] or state == "disabled"
)
if diff or host_needs_to_be_disabled:
changed = True
if not module.check_mode:
data = {}
@@ -301,12 +305,12 @@ def ensure(module, client):
data[key] = module_host.get(key)
if "usercertificate" not in data:
data["usercertificate"] = [cert["__base64__"] for cert in ipa_host.get("usercertificate", [])]
ipa_host_show = client.host_show(name=name)
if ipa_host_show.get("has_keytab", True) and (
state == "disabled" or module.params.get("random_password")
):
if host_needs_to_be_disabled:
client.host_disable(name=name)
return changed, client.host_mod(name=name, host=data)
if diff:
return changed, client.host_mod(name=name, host=data)
else:
return changed, client.host_find(name=name)
elif state == "absent":
if ipa_host:
changed = True