Merge pull request #709 from t-woerner/automationhub_fixes2

More Automation Hub fixes

plugins/module_utils/ansible_freeipa_module.py

@@ -1132,6 +1132,7 @@ else:
 
             self.deprecate(
                 msg="FreeIPABaseModule is deprecated. Use IPAAnsibleModule.",
+                version="1.5.0"
             )
 
             # Status of an execution. Will be changed to True
@@ -1174,7 +1175,8 @@ else:
                     "FreeIPABaseModule is deprecated. Use IPAAnsibleModule. "
                     "Use 'AnsibleFreeIPAParams.get_ipa_command_args()', "
                     "Instantiate it using the class 'ipa_params_mapping'."
-                )
+                ),
+                version="1.5.0"
             )
             mapping = IPAParamMapping(self, self.ipa_param_mapping)
             return mapping.get_ipa_command_args(**kwargs)
@@ -1185,6 +1187,7 @@ else:
                 msg=(
                     "FreeIPABaseModule is deprecated. Use IPAAnsibleModule. "
                 ),
+                version="1.5.0"
             )
             pass  # pylint: disable=unnecessary-pass
 
@@ -1217,6 +1220,7 @@ else:
                 msg=(
                     "FreeIPABaseModule is deprecated. Use IPAAnsibleModule. "
                 ),
+                version="1.5.0"
             )
             self.process_command_result(name, command, args, result)
 
@@ -1234,6 +1238,7 @@ else:
                     "To aid in porting to IPAAnsibleModule, change to "
                     "'FreeIPABaseModule.process_results'."
                 ),
+                version="1.5.0"
             )
 
             if "completed" in result:
@@ -1255,6 +1260,7 @@ else:
                     "FreeIPABaseModule require_ipa_attrs_change() is "
                     "deprecated. Use ansible_freeipa_module.compare_args()."
                 ),
+                version="1.5.0"
             )
             equal = compare_args_ipa(self, command_args, ipa_attrs)
             return not equal
@@ -1265,6 +1271,7 @@ else:
                 msg=(
                     "FreeIPABaseModule is deprecated. Use IPAAnsibleModule."
                 ),
+                version="1.5.0"
             )
             ipaapi_context = self.params_get("ipaapi_context")
             with self.ipa_connect(context=ipaapi_context):

plugins/modules/ipaautomember.py

@@ -194,19 +194,23 @@ def main():
         argument_spec=dict(
             # general
             inclusive=dict(type="list",
-                           aliases=["automemberinclusiveregex"], default=None,
+                           aliases=["automemberinclusiveregex"],
+                           default=None,
                            options=dict(
                                key=dict(type="str", required=True),
                                expression=dict(type="str", required=True)
                            ),
-                           elements="dict", required=False),
+                           elements="dict",
-            exclusive=dict(type="list", aliases=[
+                           required=False),
-                           "automemberexclusiveregex"], default=None,
+            exclusive=dict(type="list",
+                           aliases=["automemberexclusiveregex"],
+                           default=None,
                            options=dict(
                                key=dict(type="str", required=True),
                                expression=dict(type="str", required=True)
                            ),
-                           elements="dict", required=False),
+                           elements="dict",
+                           required=False),
             name=dict(type="list", aliases=["cn"],
                       default=None, required=True),
             description=dict(type="str", default=None),

plugins/modules/ipadnsconfig.py

@@ -181,7 +181,6 @@ def main():
             # general
             state=dict(type="str", default="present",
                        choices=["present", "absent"]),
-
         )
     )
 

plugins/modules/ipadnsrecord.py

@@ -1108,7 +1108,8 @@ def configure_module():
             name=dict(type="list", aliases=["record_name"], default=None,
                       required=False),
 
-            records=dict(type="list", default=None,
+            records=dict(type="list",
+                         default=None,
                          options=dict(
                              # Here name is a simple string
                              name=dict(type='str', required=True,

plugins/modules/ipagroup.py

@@ -393,9 +393,9 @@ def main():
                         # If yes: modify
                         # Also if it is a modification from nonposix to posix
                         # or nonposix to external.
-                        if not compare_args_ipa(ansible_module, args,
+                        if not compare_args_ipa(
-                                                res_find) or \
+                            ansible_module, args, res_find
-                           (
+                        ) or (
                             not is_posix_group(res_find) and
                             not is_external_group(res_find) and
                             (posix or external)

plugins/modules/ipauser.py

@@ -824,14 +824,17 @@ def main():
             # general
             name=dict(type="list", aliases=["login"], default=None,
                       required=False),
-            users=dict(type="list", aliases=["login"], default=None,
+            users=dict(type="list",
+                       aliases=["login"],
+                       default=None,
                        options=dict(
                            # Here name is a simple string
                            name=dict(type="str", required=True),
                            # Add user specific parameters
                            **user_spec
                        ),
-                       elements='dict', required=False),
+                       elements='dict',
+                       required=False),
 
             # deleted
             preserve=dict(required=False, type='bool', default=None),

roles/ipabackup/library/ipabackup_get_backup_dir.py

@@ -45,7 +45,7 @@ EXAMPLES = '''
 # Get IPA_BACKUP_DIR from ipaplatform
 - name: Get IPA_BACKUP_DIR from ipaplatform
   ipabackup_get_backup_dir:
-  register result
+  register: result
 '''
 
 RETURN = '''

tests/sanity/ignore-2.12.txt

@@ -0,0 +1,55 @@
+plugins/module_utils/ansible_freeipa_module.py compile-2.6!skip
+plugins/module_utils/ansible_freeipa_module.py import-2.6!skip
+plugins/module_utils/ansible_freeipa_module.py pylint:ansible-bad-import-from
+plugins/module_utils/ansible_freeipa_module.py pylint:ansible-bad-function
+plugins/module_utils/ansible_freeipa_module.py pylint:ansible-format-automatic-specification
+plugins/module_utils/ansible_freeipa_module.py pylint:ansible-deprecated-no-collection-name
+plugins/modules/ipaclient_get_facts.py compile-2.6!skip
+plugins/modules/ipaclient_get_facts.py import-2.6!skip
+plugins/modules/ipaclient_api.py pylint:ansible-format-automatic-specification
+plugins/modules/ipaclient_join.py pylint:ansible-format-automatic-specification
+plugins/modules/ipaclient_test.py pylint:ansible-format-automatic-specification
+plugins/modules/ipaconfig.py compile-2.6!skip
+plugins/modules/ipaconfig.py import-2.6!skip
+plugins/modules/ipadnsrecord.py compile-2.6!skip
+plugins/modules/ipadnsrecord.py import-2.6!skip
+plugins/modules/ipadnsrecord.py pylint:ansible-format-automatic-specification
+plugins/modules/ipadnsrecord.py pylint:use-maxsplit-arg
+plugins/modules/ipareplica_enable_ipa.py pylint:ansible-format-automatic-specification
+plugins/modules/ipareplica_prepare.py pylint:ansible-format-automatic-specification
+plugins/modules/ipareplica_test.py pylint:ansible-format-automatic-specification
+plugins/modules/ipaserver_setup_ca.py compile-2.6!skip
+plugins/modules/ipaserver_setup_ca.py import-2.6!skip
+plugins/modules/ipaserver_test.py pylint:ansible-format-automatic-specification
+plugins/modules/ipaservice.py compile-2.6!skip
+plugins/modules/ipaservice.py import-2.6!skip
+plugins/modules/ipavault.py compile-2.6!skip
+plugins/modules/ipavault.py import-2.6!skip
+roles/ipaclient/library/ipaclient_api.py pylint:ansible-format-automatic-specification
+roles/ipaclient/library/ipaclient_join.py pylint:ansible-format-automatic-specification
+roles/ipaclient/library/ipaclient_test.py pylint:ansible-format-automatic-specification
+roles/ipareplica/library/ipareplica_enable_ipa.py pylint:ansible-format-automatic-specification
+roles/ipareplica/library/ipareplica_prepare.py pylint:ansible-format-automatic-specification
+roles/ipareplica/library/ipareplica_test.py pylint:ansible-format-automatic-specification
+roles/ipaserver/library/ipaserver_test.py pylint:ansible-format-automatic-specification
+roles/ipareplica/module_utils/ansible_ipa_replica.py pylint:ansible-format-automatic-specification
+tests/external-signed-ca-with-automatic-copy/external-ca.sh shebang!skip
+tests/pytests/conftest.py pylint:ansible-format-automatic-specification
+tests/user/users.sh shebang!skip
+tests/user/users_absent.sh shebang!skip
+tests/utils.py pylint:ansible-format-automatic-specification
+tests/utils.py pylint:subprocess-run-check
+utils/ansible-doc-test shebang!skip
+utils/ansible-ipa-client-install shebang!skip
+utils/ansible-ipa-replica-install shebang!skip
+utils/ansible-ipa-server-install shebang!skip
+utils/build-galaxy-release.sh shebang!skip
+utils/build-srpm.sh shebang!skip
+utils/changelog shebang!skip
+utils/galaxyfy-README.py shebang!skip
+utils/galaxyfy-module-EXAMPLES.py shebang!skip
+utils/galaxyfy-playbook.py shebang!skip
+utils/galaxyfy.py shebang!skip
+utils/gen_modules_docs.sh shebang!skip
+utils/lint_check.sh shebang!skip
+utils/new_module shebang!skip

utils/build-galaxy-release.sh

@@ -84,7 +84,7 @@ rm plugins/module_utils/ansible_ipa_*
 rm plugins/modules/ipaserver_*
 rm plugins/modules/ipareplica_*
 rm plugins/modules/ipaclient_*
+rm plugins/modules/ipabackup_*
 rm plugins/action/ipaclient_*
-rm plugins/action/ipabackup_*
 rmdir plugins/action
 git reset --hard

utils/gen_module_docs.py

@@ -55,10 +55,9 @@ param_docs = {
     "no_pkinit": "Disable pkinit setup steps",
     "no_ui_redirect": "Do not automatically redirect to the Web UI",
     "external_ca": "External ca setting",
-    "setup_adtrust": "Configure AD trust capability",
     "external_cert_files": [
-      "File containing the IPA CA certificate and the external CA certificate",
+        "File containing the IPA CA certificate and the external CA "
-      "chain"
+        "certificate chain"
     ],
     "reverse_zones": "The reverse DNS zones to use",
     "no_reverse": "Do not create new reverse DNS zone",
@@ -132,8 +131,8 @@ param_docs = {
     "debug": "Turn on extra debugging",
     "basedn": "The basedn of the IPA server (of the form dc=example,dc=com)",
     "allow_repair": [
-      "Allow repair of already joined hosts. Contrary to ipaclient_force_join",
+        "Allow repair of already joined hosts. Contrary to "
-      "the host entry will not be changed on the server"
+        "ipaclient_force_join the host entry will not be changed on the server"
     ],
     "backup": "File to backup",
     "fqdn": [