From 401b911171ef7589d719a5432132c3f7e1f7e509 Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Wed, 26 Jan 2022 08:42:05 -0300
Subject: [PATCH] ipauser: Make 'no user' messages consistent.
When ensuring states 'undeleted', 'enabled', 'disabled', and 'unlocked'
the error messages for an unexistent user were not consistent.
This change changes the message for all states to "No user '%s'."
---
plugins/modules/ipauser.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/plugins/modules/ipauser.py b/plugins/modules/ipauser.py
index d11d15b9..aee71cd2 100644
--- a/plugins/modules/ipauser.py
+++ b/plugins/modules/ipauser.py
@@ -1354,14 +1354,14 @@ def main():
if res_find.get("preserved", False):
commands.append([name, "user_undel", {}])
else:
- raise ValueError("No preserved user '%s'" % name)
+ raise ValueError("No user '%s'" % name)
elif state == "enabled":
if res_find is not None:
if res_find["nsaccountlock"]:
commands.append([name, "user_enable", {}])
else:
- raise ValueError("No disabled user '%s'" % name)
+ raise ValueError("No user '%s'" % name)
elif state == "disabled":
if res_find is not None:
@@ -1373,6 +1373,8 @@ def main():
elif state == "unlocked":
if res_find is not None:
commands.append([name, "user_unlock", {}])
+ else:
+ raise ValueError("No user '%s'" % name)
else:
ansible_module.fail_json(msg="Unkown state '%s'" % state)
--
GitLab