Merge pull request #174 from t-woerner/ipahost_member_only_fail

ipahost: Enhanced failure msg for member params used without member action.
freeipa · Dec 24, 2019 · f501bfd · f501bfd
2 parents 3fc5da5 + 24515e4
commit f501bfd
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/plugins/modules/ipahost.py b/plugins/modules/ipahost.py
@@ -513,19 +513,25 @@ def check_parameters(
                    "userclass", "auth_ind", "requires_pre_auth",
                    "ok_as_delegate", "ok_to_auth_as_delegate", "force",
                    "reverse", "ip_address", "update_password"]
+        for x in invalid:
+            if vars()[x] is not None:
+                module.fail_json(
+                    msg="Argument '%s' can not be used with state '%s'" %
+                    (x, state))
         if action == "host":
-            invalid.extend([
+            invalid = [
                 "certificate", "managedby_host", "principal",
                 "allow_create_keytab_user", "allow_create_keytab_group",
                 "allow_create_keytab_host", "allow_create_keytab_hostgroup",
                 "allow_retrieve_keytab_user", "allow_retrieve_keytab_group",
                 "allow_retrieve_keytab_host",
-                "allow_retrieve_keytab_hostgroup"])
-        for x in invalid:
-            if vars()[x] is not None:
-                module.fail_json(
-                    msg="Argument '%s' can not be used with state '%s'" %
-                    (x, state))
+                "allow_retrieve_keytab_hostgroup"
+            ]
+            for x in invalid:
+                if vars()[x] is not None:
+                    module.fail_json(
+                        msg="Argument '%s' can only be used with action "
+                        "'member' for state '%s'" % (x, state))
 
 
 def main():