mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-07-30 19:34:45 +00:00
Merge pull request #918 from t-woerner/fix_plugins_for_ansible_fake_execution_test
Fix plugins for ansible fake execution test
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -866,8 +866,13 @@ RETURN = """
|
|||||||
from ansible.module_utils._text import to_text
|
from ansible.module_utils._text import to_text
|
||||||
from ansible.module_utils.ansible_freeipa_module import \
|
from ansible.module_utils.ansible_freeipa_module import \
|
||||||
IPAAnsibleModule, is_ipv4_addr, is_ipv6_addr, ipalib_errors
|
IPAAnsibleModule, is_ipv4_addr, is_ipv6_addr, ipalib_errors
|
||||||
import dns.reversename
|
try:
|
||||||
import dns.resolver
|
import dns.reversename
|
||||||
|
import dns.resolver
|
||||||
|
except ImportError as _err:
|
||||||
|
MODULE_IMPORT_ERROR = str(_err)
|
||||||
|
else:
|
||||||
|
MODULE_IMPORT_ERROR = None
|
||||||
|
|
||||||
from ansible.module_utils import six
|
from ansible.module_utils import six
|
||||||
|
|
||||||
@@ -1131,6 +1136,9 @@ def configure_module():
|
|||||||
|
|
||||||
ansible_module._ansible_debug = True
|
ansible_module._ansible_debug = True
|
||||||
|
|
||||||
|
if MODULE_IMPORT_ERROR is not None:
|
||||||
|
ansible_module.fail_json(msg=MODULE_IMPORT_ERROR)
|
||||||
|
|
||||||
return ansible_module
|
return ansible_module
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -201,7 +201,6 @@ dnszone:
|
|||||||
returned: always
|
returned: always
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from ipapython.dnsutil import DNSName # noqa: E402
|
|
||||||
from ansible.module_utils.ansible_freeipa_module import (
|
from ansible.module_utils.ansible_freeipa_module import (
|
||||||
IPAAnsibleModule,
|
IPAAnsibleModule,
|
||||||
is_ip_address,
|
is_ip_address,
|
||||||
@@ -210,8 +209,9 @@ from ansible.module_utils.ansible_freeipa_module import (
|
|||||||
ipalib_errors,
|
ipalib_errors,
|
||||||
compare_args_ipa,
|
compare_args_ipa,
|
||||||
IPAParamMapping,
|
IPAParamMapping,
|
||||||
|
DNSName,
|
||||||
|
netaddr
|
||||||
) # noqa: E402
|
) # noqa: E402
|
||||||
import netaddr
|
|
||||||
from ansible.module_utils import six
|
from ansible.module_utils import six
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
plugins/module_utils/ansible_freeipa_module.py compile-2.6!skip
|
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 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-bad-function
|
||||||
plugins/module_utils/ansible_freeipa_module.py pylint:ansible-format-automatic-specification
|
|
||||||
plugins/modules/ipaclient_get_facts.py compile-2.6!skip
|
plugins/modules/ipaclient_get_facts.py compile-2.6!skip
|
||||||
plugins/modules/ipaclient_get_facts.py import-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_api.py pylint:ansible-format-automatic-specification
|
||||||
|
|||||||
Reference in New Issue
Block a user