Skip to content
Snippets Groups Projects
Commit 6caa58e8 authored by Thomas Woerner's avatar Thomas Woerner
Browse files

ansible_freeipa_module: Import and provide normalize_sshpubkey

normalize_sshpubkey is imported from ipalib.util and also added to
__all__ for use in modules.
parent cbff802d
No related branches found
No related tags found
No related merge requests found
...@@ -31,7 +31,7 @@ __all__ = ["gssapi", "netaddr", "api", "ipalib_errors", "Env", ...@@ -31,7 +31,7 @@ __all__ = ["gssapi", "netaddr", "api", "ipalib_errors", "Env",
"paths", "tasks", "get_credentials_if_valid", "Encoding", "paths", "tasks", "get_credentials_if_valid", "Encoding",
"DNSName", "getargspec", "certificate_loader", "DNSName", "getargspec", "certificate_loader",
"write_certificate_list", "boolean", "template_str", "write_certificate_list", "boolean", "template_str",
"urlparse"] "urlparse", "normalize_sshpubkey"]
import os import os
# ansible-freeipa requires locale to be C, IPA requires utf-8. # ansible-freeipa requires locale to be C, IPA requires utf-8.
...@@ -157,6 +157,8 @@ try: ...@@ -157,6 +157,8 @@ try:
except ImportError: except ImportError:
from ansible.module_utils.six.moves.urllib.parse import urlparse from ansible.module_utils.six.moves.urllib.parse import urlparse
from ipalib.util import normalize_sshpubkey
except ImportError as _err: except ImportError as _err:
ANSIBLE_FREEIPA_MODULE_IMPORT_ERROR = str(_err) ANSIBLE_FREEIPA_MODULE_IMPORT_ERROR = str(_err)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment